diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-05 15:38:04 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-05 15:38:04 +0000 |
| commit | 643906d485992e8043469ea0cb00a069349bce70 (patch) | |
| tree | 2fcc05e34fbc8f60c81a69bae4851b3b5942c41a | |
| parent | 2dfedc6a1c68c09fd53e9f799aeb3510d8b1302d (diff) | |
Revert accidental commit
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 2 | ||||
| -rw-r--r-- | glib/gstrfuncs.c | 9 |
3 files changed, 5 insertions, 8 deletions
@@ -1,4 +1,6 @@ 2006-06-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gstrfuncs.c: Revert accidental commit. * glib/gmain.c (get_dispatch): Don't leak the dispatch struct. (#321886) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index dda43a87d..7b4fe74b8 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,4 +1,6 @@ 2006-06-05 Matthias Clasen <mclasen@redhat.com> + + * glib/gstrfuncs.c: Revert accidental commit. * glib/gmain.c (get_dispatch): Don't leak the dispatch struct. (#321886) diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index 1150c46bc..61d11edcb 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -30,7 +30,6 @@ #include "config.h" -#define __G_STRFUNCS_C__ #define _GNU_SOURCE /* For stpcpy */ #include <stdarg.h> @@ -95,7 +94,6 @@ g_strdup (const gchar *str) else new_str = NULL; - g_mem_mark_type (new_str, G_MEM_TYPE_STRING, 0); return new_str; } @@ -131,7 +129,6 @@ g_strndup (const gchar *str, else new_str = NULL; - g_mem_mark_type (new_str, G_MEM_TYPE_STRING, 0); return new_str; } @@ -190,7 +187,6 @@ g_strdup_vprintf (const gchar *format, g_vasprintf (&string, format, args); - g_mem_mark_type (string, G_MEM_TYPE_STRING, 0); return string; } @@ -359,7 +355,6 @@ g_ascii_strtod (const gchar *nptr, decimal_point[1] != 0) { p = nptr; - /* Skip leading space */ while (g_ascii_isspace (*p)) p++; @@ -1590,8 +1585,7 @@ g_ascii_strdown (const gchar *str, result = g_strndup (str, len); for (s = result; *s; s++) *s = g_ascii_tolower (*s); - - g_mem_mark_type (result, G_MEM_TYPE_STRING, 0); + return result; } @@ -1623,7 +1617,6 @@ g_ascii_strup (const gchar *str, for (s = result; *s; s++) *s = g_ascii_toupper (*s); - g_mem_mark_type (result, G_MEM_TYPE_STRING, 0); return result; } |