Changed prototype of printf_string_upper_bound to return gsize. Now

* glib/gmessages.c: Changed prototype of printf_string_upper_bound
to return gsize.  Now matches the actual function body.

* glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2
from gint to gssize.  Now matches the prototype in gstrfuncs.h.

diff --git a/ChangeLog b/ChangeLog
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 38d3206..95c9774 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2001-07-12  Mark Murnane  <Mark.Murnane@sun.com>
+
+       * glib/gmessages.c: Changed prototype of printf_string_upper_bound
+       to return gsize.  Now matches the actual function body.
+
+       * glib/gstrfuncs.c (g_strrstr_len): Changed type of parameter #2 
+       from gint to gssize.  Now matches the prototype in gstrfuncs.h.
+       
 2001-07-11  Darin Adler  <darin@bentspoon.com>
 
        * .cvsignore: Add some generated files.

diff --git a/glib/gmessages.c b/glib/gmessages.c
index fe10e74..11d0c34 100644 (file)
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -71,7 +71,7 @@ struct _GLogHandler
 
 
 /* --- prototypes --- */
-static guint printf_string_upper_bound (const gchar *format,
+static gsize printf_string_upper_bound (const gchar *format,
                                        gboolean     may_warn,
                                        va_list      args);
 

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 0db804b..feb88c6 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1879,7 +1879,7 @@ g_strrstr (const gchar *haystack,
  **/
 gchar *
 g_strrstr_len (const gchar *haystack,
-              gint         haystack_len,
+              gssize        haystack_len,
               const gchar *needle)
 {
   g_return_val_if_fail (haystack != NULL, NULL);