Mercurial > pidgin.yaz
changeset 5451:e1cc0c67e123
[gaim-migrate @ 5839]
some compile cleanups, and more importantly, the rest of that tobase16 fix
that I forgot about
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Tue, 20 May 2003 01:31:56 +0000 |
| parents | bb1e160467b6 |
| children | cb2a6b373ba1 |
| files | src/gtkblist.c src/prefs.c src/prefs.h src/util.c src/util.h |
| diffstat | 5 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkblist.c Tue May 20 00:45:35 2003 +0000 +++ b/src/gtkblist.c Tue May 20 01:31:56 2003 +0000 @@ -2199,7 +2199,7 @@ { GtkTreeIter more_z, iter; GaimBlistNode *n; - GtkTreePath *newpath, *expand; + GtkTreePath *newpath, *expand = NULL; GValue val = {0,}; struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data; char *collapsed = gaim_group_get_setting((struct group *)node->parent, "collapsed");
--- a/src/prefs.c Tue May 20 00:45:35 2003 +0000 +++ b/src/prefs.c Tue May 20 01:31:56 2003 +0000 @@ -288,7 +288,7 @@ } } -void gaim_prefs_set_string(const char *name, char *value) { +void gaim_prefs_set_string(const char *name, const char *value) { struct gaim_pref *pref = find_pref(name); g_return_if_fail(pref != NULL);
--- a/src/prefs.h Tue May 20 00:45:35 2003 +0000 +++ b/src/prefs.h Tue May 20 01:31:56 2003 +0000 @@ -125,7 +125,7 @@ * @param name The name of the pref * @param value The value to set */ -void gaim_prefs_set_string(const char *name, char *value); +void gaim_prefs_set_string(const char *name, const char *value); /** * Get boolean pref value
--- a/src/util.c Tue May 20 00:45:35 2003 +0000 +++ b/src/util.c Tue May 20 01:31:56 2003 +0000 @@ -467,7 +467,7 @@ /* * Converts raw data to a pretty, null-terminated base16 string. */ -char *tobase16(const char *data, int length) +unsigned char *tobase16(const unsigned char *data, int length) { int i; unsigned char *ascii = NULL;
--- a/src/util.h Tue May 20 00:45:35 2003 +0000 +++ b/src/util.h Tue May 20 01:31:56 2003 +0000 @@ -73,14 +73,14 @@ * * @see frombase16() */ -char *tobase16(const char *str, int len); +unsigned char *tobase16(const unsigned char *str, int len); /** * Converts a string back from its base-16 equivalent. * * @param str The string to convert back. * @param ret_str The returned, non-base-16 string. - * + * * @return The length of the returned string. * * @see tobase16()