actually enable (and fix up the length test).

Wed Dec  1 17:04:37 2004  Manish Singh  <yosh@gimp.org>

        * glib/gstring.h (g_string_append_c_inline): actually enable (and
        fix up the length test).

diff --git a/ChangeLog b/ChangeLog
index ff837f535b45632f55431c4185314e81982140c6..bba99ecaf4bf62592b46461c449948341e8f8eed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec  1 17:04:37 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gstring.h (g_string_append_c_inline): actually enable (and
+       fix up the length test).
+
 2004-11-30  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am (glib.def): gcc -E complains "linker input file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ff837f535b45632f55431c4185314e81982140c6..bba99ecaf4bf62592b46461c449948341e8f8eed 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Dec  1 17:04:37 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gstring.h (g_string_append_c_inline): actually enable (and
+       fix up the length test).
+
 2004-11-30  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am (glib.def): gcc -E complains "linker input file

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ff837f535b45632f55431c4185314e81982140c6..bba99ecaf4bf62592b46461c449948341e8f8eed 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Wed Dec  1 17:04:37 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gstring.h (g_string_append_c_inline): actually enable (and
+       fix up the length test).
+
 2004-11-30  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am (glib.def): gcc -E complains "linker input file

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ff837f535b45632f55431c4185314e81982140c6..bba99ecaf4bf62592b46461c449948341e8f8eed 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Dec  1 17:04:37 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gstring.h (g_string_append_c_inline): actually enable (and
+       fix up the length test).
+
 2004-11-30  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am (glib.def): gcc -E complains "linker input file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ff837f535b45632f55431c4185314e81982140c6..bba99ecaf4bf62592b46461c449948341e8f8eed 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Dec  1 17:04:37 2004  Manish Singh  <yosh@gimp.org>
+
+       * glib/gstring.h (g_string_append_c_inline): actually enable (and
+       fix up the length test).
+
 2004-11-30  Tor Lillqvist  <tml@iki.fi>
 
        * glib/Makefile.am (glib.def): gcc -E complains "linker input file

diff --git a/glib/gstring.h b/glib/gstring.h
index 7357291ec19a2ecf49b894c54feaa7fdb7a16d7e..ea67dc9108ffe85baae4978313d9f7ebc3038056 100644 (file)
--- a/glib/gstring.h
+++ b/glib/gstring.h
@@ -122,7 +122,7 @@ static inline GString*
 g_string_append_c_inline (GString *gstring,
                           gchar    c)
 {
-  if (gstring->len < gstring->allocated_len && 0)
+  if (gstring->len + 1 < gstring->allocated_len)
     {
       gstring->str[gstring->len++] = c;
       gstring->str[gstring->len] = 0;