Mercurial > pidgin.yaz
changeset 5497:3c7748b24410
[gaim-migrate @ 5893]
I changed some small things.
1) 3 comments in 3 different files which makes "make docs" not give 3
warnings.
2) Made frombase16 return-via-parameter an unsigned char* instead of a
char*. Nothing actually uses frombase16, so this doesn't affect anything,
but it mirrors Nathan's change to tobase16, and should make the conversion
work correctly.
3) Fixed the bug Luke mailed to gaim-devel on Monday:
"sign on, change an aim account's email address, sign off, segfault.
it's happened 2x now" --Luke "The Yellow Dart" Schierer
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 23 May 2003 01:45:17 +0000 |
| parents | b7c0be69c749 |
| children | cce2d7868c78 |
| files | src/blist.h src/gtkdebug.h src/notify.h src/protocols/oscar/oscar.c src/util.c src/util.h |
| diffstat | 6 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/blist.h Fri May 23 00:48:20 2003 +0000 +++ b/src/blist.h Fri May 23 01:45:17 2003 +0000 @@ -1,5 +1,5 @@ /** - * @file list.h Buddy List API + * @file blist.h Buddy List API * @ingroup core * * gaim
--- a/src/gtkdebug.h Fri May 23 00:48:20 2003 +0000 +++ b/src/gtkdebug.h Fri May 23 01:45:17 2003 +0000 @@ -1,5 +1,5 @@ /** - * @file gtkdebug.c GTK+ Debug API + * @file gtkdebug.h GTK+ Debug API * @ingroup gtkui * * gaim
--- a/src/notify.h Fri May 23 00:48:20 2003 +0000 +++ b/src/notify.h Fri May 23 01:45:17 2003 +0000 @@ -193,5 +193,6 @@ * @param ops The UI operations structure. */ GaimNotifyUiOps *gaim_get_notify_ui_ops(void); +/*@}*/ #endif /* _GAIM_NOTIFY_H_ */
--- a/src/protocols/oscar/oscar.c Fri May 23 00:48:20 2003 +0000 +++ b/src/protocols/oscar/oscar.c Fri May 23 01:45:17 2003 +0000 @@ -3717,6 +3717,7 @@ gaim_debug(GAIM_DEBUG_INFO, "oscar", "setting email\n"); aim_admin_setemail(sess, fr->conn, od->email); g_free(od->email); + od->email = NULL; od->setemail = FALSE; }
--- a/src/util.c Fri May 23 00:48:20 2003 +0000 +++ b/src/util.c Fri May 23 01:45:17 2003 +0000 @@ -486,15 +486,15 @@ /* * Converts a null-terminated string of hexidecimal to raw data. */ -int frombase16(const char *ascii, char **raw) +int frombase16(const char *ascii, unsigned char **raw) { int len, i, accumulator=0; - char *data; + unsigned char *data; if (!ascii || !(len = strlen(ascii)) || (len % 2)) return 0; - data = (char *)malloc((len/2)*sizeof(char)); + data = malloc(len/2); for (i=0; i<len; i++) { if (!(i % 2)) accumulator = 0;