Permalink
Browse files

Namespace cleanup: Prefix user_info with ds_

  • Loading branch information...
1 parent 2daabd2 commit 5d5e24306bc0a2580f05cf0784998e65b2e29118 @SimonKagstrom committed Mar 13, 2011
Showing with 7 additions and 7 deletions.
  1. +1 −1 src/bindings/ruby/ext/main.h
  2. +1 −1 src/clients/simple/simple.c
  3. +2 −2 src/lib/despotify.h
  4. +1 −1 src/lib/session.h
  5. +1 −1 src/lib/xml.c
  6. +1 −1 src/lib/xml.h
@@ -25,7 +25,7 @@ typedef struct link ds_link_t;
typedef struct ds_search_result ds_search_t;
typedef struct despotify_session ds_session_t;
typedef struct ds_track ds_track_t;
-typedef struct user_info ds_user_info_t;
+typedef struct ds_user_info ds_user_info_t;
#define BOOL2VALUE(exp) exp ? Qtrue : Qfalse
#define RB_DESPOTIFYERR(session) \
@@ -231,7 +231,7 @@ void print_search(struct ds_search_result *search)
void print_info(struct despotify_session* ds)
{
- struct user_info* user = ds->user_info;
+ struct ds_user_info* user = ds->user_info;
wrapper_wprintf(L"Username : %s\n", user->username);
wrapper_wprintf(L"Country : %s\n", user->country);
wrapper_wprintf(L"Account type : %s\n", user->type);
View
@@ -107,7 +107,7 @@ struct ds_artist_browse
struct ds_album_browse* albums;
};
-struct user_info
+struct ds_user_info
{
char username[STRING_LENGTH];
char country[4];
@@ -169,7 +169,7 @@ struct despotify_session
{
bool initialized;
struct session* session;
- struct user_info* user_info;
+ struct ds_user_info* user_info;
const char *last_error;
/* AES CTR state */
View
@@ -121,7 +121,7 @@ typedef struct session
unsigned char cache_hash[20];
/* General user info exposed by the API */
- struct user_info user_info;
+ struct ds_user_info user_info;
/* login synchronization */
pthread_mutex_t login_mutex;
View
@@ -528,7 +528,7 @@ void xml_free_album_browse(struct ds_album_browse* album)
}
}
-void xml_parse_prodinfo(struct user_info* u, unsigned char* xml, int len)
+void xml_parse_prodinfo(struct ds_user_info* u, unsigned char* xml, int len)
{
ezxml_t top = ezxml_parse_str(xml, len);
xmlstrncpy(u->type, sizeof u->type, top, "product", 0, "type", -1);
View
@@ -45,7 +45,7 @@ void xml_free_artist_browse(struct ds_artist_browse* artist);
void xml_free_album(struct ds_album* album);
void xml_free_album_browse(struct ds_album_browse* album);
-void xml_parse_prodinfo(struct user_info* u, unsigned char* xml, int len);
+void xml_parse_prodinfo(struct ds_user_info* u, unsigned char* xml, int len);
char* xml_gen_tag(char* name, char* content);

0 comments on commit 5d5e243

Please sign in to comment.