Make user member names more consistent

3 files changed, 81 insertions, 81 deletions

diff --git a/main.c b/main.c
index 9530b1f..ca26bc6 100644
--- a/main.c
+++ b/main.c
@@ -35,13 +35,13 @@ int main(void)
 	rtclient_user_showname(&user, name);
 
 	if (user) {
-		printf("id: %u\nname: %s\npassword: %s\nemailaddress: %s\nrealname: %s\nnickname: %s\norganization: %s\naddress1: %s\naddress2: %s\ncity: %s\nstate: %s\nzip: %s\ncountry: %s\nhomephone: %s\nworkphone: %s\nmobilephone: %s\npagerphone: %s\ncontactinfo: %s\ncomments: %s\nsignature: %s\ngecos: %s\nlang: %u\ntimezone: %u\nprivileged: %u\ndisabled: %u\n"
+		printf("id: %u\nName: %s\nPassword: %s\nEmail Address: %s\nReal Name: %s\nNick Name: %s\nOrganization: %s\nAddress 1: %s\nAddress 2: %s\nCity: %s\nState: %s\nZip: %s\nCountry: %s\nHomephone: %s\nWorkphone: %s\nMobilephone: %s\nPagerphone: %s\nContact Info: %s\nComments: %s\nSignature: %s\nGecos: %s\nLang: %u\nTimezone: %u\nPrivileged: %u\nDisabled: %u\n"
 				, user->id
 				, user->name
 				, user->password
-				, user->emailaddress
-				, user->realname
-				, user->nickname
+				, user->email_address
+				, user->real_name
+				, user->nick_name
 				, user->organization
 				, user->address1
 				, user->address2
@@ -49,11 +49,11 @@ int main(void)
 				, user->state
 				, user->zip
 				, user->country
-				, user->homephone
-				, user->workphone
-				, user->mobilephone
-				, user->pagerphone
-				, user->contactinfo
+				, user->home_phone
+				, user->work_phone
+				, user->mobile_phone
+				, user->pager_phone
+				, user->contact_info
 				, user->comments
 				, user->signature
 				, user->gecos
diff --git a/rtclient/user.h b/rtclient/user.h
index d0cfef2..1be668a 100644
--- a/rtclient/user.h
+++ b/rtclient/user.h
@@ -412,9 +412,9 @@ struct rtclient_user {
 	unsigned int id;
 	char *name;
 	char *password;
-	char *emailaddress;
-	char *realname;
-	char *nickname;
+	char *email_address;
+	char *real_name;
+	char *nick_name;
 	char *organization;
 	char *address1;
 	char *address2;
@@ -422,11 +422,11 @@ struct rtclient_user {
 	char *state;
 	char *zip;
 	char *country;
-	char *homephone;
-	char *workphone;
-	char *mobilephone;
-	char *pagerphone;
-	char *contactinfo;
+	char *home_phone;
+	char *work_phone;
+	char *mobile_phone;
+	char *pager_phone;
+	char *contact_info;
 	char *comments;
 	char *signature;
 	char *gecos;
@@ -442,9 +442,9 @@ extern "C" {
 
 	void rtclient_user_new(const char *name
 			, const char *password
-			, const char *emailaddress
-			, const char *realname
-			, const char *nickname
+			, const char *email_address
+			, const char *real_name
+			, const char *nick_name
 			, const char *organization
 			, const char *address1
 			, const char *address2
@@ -452,11 +452,11 @@ extern "C" {
 			, const char *state
 			, const char *zip
 			, const char *country
-			, const char *homephone
-			, const char *workphone
-			, const char *mobilephone
-			, const char *pagerphone
-			, const char *contactinfo
+			, const char *home_phone
+			, const char *work_phone
+			, const char *mobile_phone
+			, const char *pager_phone
+			, const char *contact_info
 			, const char *comments
 			, const char *signature
 			, const char *gecos
diff --git a/user.c b/user.c
index b63c7d8..5612aba 100644
--- a/user.c
+++ b/user.c
@@ -7,9 +7,9 @@ typedef struct rtclient_user rtclient_user;
 
 void rtclient_user_new(const char *name
 		, const char *password
-		, const char *emailaddress
-		, const char *realname
-		, const char *nickname
+		, const char *email_address
+		, const char *real_name
+		, const char *nick_name
 		, const char *organization
 		, const char *address1
 		, const char *address2
@@ -17,11 +17,11 @@ void rtclient_user_new(const char *name
 		, const char *state
 		, const char *zip
 		, const char *country
-		, const char *homephone
-		, const char *workphone
-		, const char *mobilephone
-		, const char *pagerphone
-		, const char *contactinfo
+		, const char *home_phone
+		, const char *work_phone
+		, const char *mobile_phone
+		, const char *pager_phone
+		, const char *contact_info
 		, const char *comments
 		, const char *signature
 		, const char *gecos
@@ -33,9 +33,9 @@ void rtclient_user_new(const char *name
 	post("REST/1.0/user/new", (const char *[]){
 			name, "Name"
 			, password, "Password"
-			, emailaddress, "EmailAddress"
-			, realname, "RealName"
-			, nickname, "NickName"
+			, email_address, "EmailAddress"
+			, real_name, "RealName"
+			, nick_name, "NickName"
 			, organization, "Organization"
 			, address1, "Address1"
 			, address2, "Address2"
@@ -43,11 +43,11 @@ void rtclient_user_new(const char *name
 			, state, "State"
 			, zip, "Zip"
 			, country, "Country"
-			, homephone, "HomePhone"
-			, workphone, "WorkPhone"
-			, mobilephone, "MobilePhone"
-			, pagerphone, "PagerPhone"
-			, contactinfo, "ContactInfo"
+			, home_phone, "HomePhone"
+			, work_phone, "WorkPhone"
+			, mobile_phone, "MobilePhone"
+			, pager_phone, "PagerPhone"
+			, contact_info, "ContactInfo"
 			, comments, "Comments"
 			, signature, "Signature"
 			, gecos, "Gecos"
@@ -86,16 +86,16 @@ static size_t show_callback(void *contents, size_t size, size_t nmemb
 				strcpy(user->name, ++token);
 			} else if (!strcmp(token, "EmailAddress")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->emailaddress = malloc(strlen(token));
-				strcpy(user->emailaddress, ++token);
+				user->email_address = malloc(strlen(token));
+				strcpy(user->email_address, ++token);
 			} else if (!strcmp(token, "RealName")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->realname = malloc(strlen(token));
-				strcpy(user->realname, ++token);
+				user->real_name = malloc(strlen(token));
+				strcpy(user->real_name, ++token);
 			} else if (!strcmp(token, "NickName")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->nickname = malloc(strlen(token));
-				strcpy(user->nickname, ++token);
+				user->nick_name = malloc(strlen(token));
+				strcpy(user->nick_name, ++token);
 			} else if (!strcmp(token, "Gecos")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
 				user->gecos = malloc(strlen(token));
@@ -130,24 +130,24 @@ static size_t show_callback(void *contents, size_t size, size_t nmemb
 				strcpy(user->country, ++token);
 			} else if (!strcmp(token, "HomePhone")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->homephone = malloc(strlen(token));
-				strcpy(user->homephone, ++token);
+				user->home_phone = malloc(strlen(token));
+				strcpy(user->home_phone, ++token);
 			} else if (!strcmp(token, "WorkPhone")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->workphone = malloc(strlen(token));
-				strcpy(user->workphone, ++token);
+				user->work_phone = malloc(strlen(token));
+				strcpy(user->work_phone, ++token);
 			} else if (!strcmp(token, "MobilePhone")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->mobilephone = malloc(strlen(token));
-				strcpy(user->mobilephone, ++token);
+				user->mobile_phone = malloc(strlen(token));
+				strcpy(user->mobile_phone, ++token);
 			} else if (!strcmp(token, "PagerPhone")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->pagerphone = malloc(strlen(token));
-				strcpy(user->pagerphone, ++token);
+				user->pager_phone = malloc(strlen(token));
+				strcpy(user->pager_phone, ++token);
 			} else if (!strcmp(token, "ContactInfo")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
-				user->contactinfo = malloc(strlen(token));
-				strcpy(user->contactinfo, ++token);
+				user->contact_info = malloc(strlen(token));
+				strcpy(user->contact_info, ++token);
 			} else if (!strcmp(token, "Comments")) {
 				token = strtok_r(NULL, ":", &tokensaveptr);
 				user->comments = malloc(strlen(token));
@@ -187,9 +187,9 @@ static inline void user_init(rtclient_user **userptr)
 	user->id = 0;
 	user->name = NULL;
 	user->password = NULL;
-	user->emailaddress = NULL;
-	user->realname = NULL;
-	user->nickname = NULL;
+	user->email_address = NULL;
+	user->real_name = NULL;
+	user->nick_name = NULL;
 	user->organization = NULL;
 	user->address1 = NULL;
 	user->address2 = NULL;
@@ -197,11 +197,11 @@ static inline void user_init(rtclient_user **userptr)
 	user->state = NULL;
 	user->zip = NULL;
 	user->country = NULL;
-	user->homephone = NULL;
-	user->workphone = NULL;
-	user->mobilephone = NULL;
-	user->pagerphone = NULL;
-	user->contactinfo = NULL;
+	user->home_phone = NULL;
+	user->work_phone = NULL;
+	user->mobile_phone = NULL;
+	user->pager_phone = NULL;
+	user->contact_info = NULL;
 	user->comments = NULL;
 	user->signature = NULL;
 	user->gecos = NULL;
@@ -231,12 +231,12 @@ void rtclient_user_free(rtclient_user *user)
 		free(user->name);
 	if (user->password)
 		free(user->password);
-	if (user->emailaddress)
-		free(user->emailaddress);
-	if (user->realname)
-		free(user->realname);
-	if (user->nickname)
-		free(user->nickname);
+	if (user->email_address)
+		free(user->email_address);
+	if (user->real_name)
+		free(user->real_name);
+	if (user->nick_name)
+		free(user->nick_name);
 	if (user->organization)
 		free(user->organization);
 	if (user->address1)
@@ -251,16 +251,16 @@ void rtclient_user_free(rtclient_user *user)
 		free(user->zip);
 	if (user->country)
 		free(user->country);
-	if (user->homephone)
-		free(user->homephone);
-	if (user->workphone)
-		free(user->workphone);
-	if (user->mobilephone)
-		free(user->mobilephone);
-	if (user->pagerphone)
-		free(user->pagerphone);
-	if (user->contactinfo)
-		free(user->contactinfo);
+	if (user->home_phone)
+		free(user->home_phone);
+	if (user->work_phone)
+		free(user->work_phone);
+	if (user->mobile_phone)
+		free(user->mobile_phone);
+	if (user->pager_phone)
+		free(user->pager_phone);
+	if (user->contact_info)
+		free(user->contact_info);
 	if (user->comments)
 		free(user->comments);
 	if (user->signature)