Mercurial > pidgin
diff src/util.c @ 5341:ccec8893c1be
[gaim-migrate @ 5717]
This fixes a memleak from my change last night. Thanks to Matt Pandina
for pointing out that I'm dumb :-)
Also, I made sec_to_text use g_strdup_printf instead of g_snprintf with a
fixed sized buffer. Down with fixed size buffers everywhere! Ra ra ree!
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 09 May 2003 14:39:06 +0000 |
parents | 6dfcd7dbecde |
children | 8d8bf0d31a23 |
line wrap: on
line diff
--- a/src/util.c Fri May 09 06:27:51 2003 +0000 +++ b/src/util.c Fri May 09 14:39:06 2003 +0000 @@ -93,7 +93,7 @@ gchar *sec_to_text(guint sec) { guint daze, hrs, min; - char *ret = g_malloc(256); + char *ret = NULL; daze = sec / (60 * 60 * 24); hrs = (sec % (60 * 60 * 24)) / (60 * 60); @@ -104,33 +104,33 @@ if (hrs || min) { if (hrs) { if (min) { - g_snprintf(ret, 256, + ret = g_strdup_printf( "%d %s, %d %s, %d %s.", daze, ngettext("day","days",daze), hrs, ngettext("hour","hours",hrs), min, ngettext("minute","minutes",min)); } else { - g_snprintf(ret, 256, + ret = g_strdup_printf( "%d %s, %d %s.", daze, ngettext("day","days",daze), hrs, ngettext("hour","hours",hrs)); } } else { - g_snprintf(ret, 256, + ret = g_strdup_printf( "%d %s, %d %s.", daze, ngettext("day","days",daze), min, ngettext("minute","minutes",min)); } } else - g_snprintf(ret, 256, "%d %s.", daze, ngettext("day","days",daze)); + ret = g_strdup_printf("%d %s.", daze, ngettext("day","days",daze)); } else { if (hrs) { if (min) { - g_snprintf(ret, 256, + ret = g_strdup_printf( "%d %s, %d %s.", hrs, ngettext("hour","hours",hrs), min, ngettext("minute","minutes",min)); } else { - g_snprintf(ret, 256, "%d %s.", hrs, ngettext("hour","hours",hrs)); + ret = g_strdup_printf("%d %s.", hrs, ngettext("hour","hours",hrs)); } } else { - g_snprintf(ret, 256, "%d %s.", min, ngettext("minute","minutes",min)); + ret = g_strdup_printf("%d %s.", min, ngettext("minute","minutes",min)); } }