cast the string size to gulong and use %lu for printing to avoid 64bit

Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>

	* tests/testglib.c (main): cast the string size to gulong and use %lu
	  for printing to avoid 64bit issues

	* glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument
	  to gsize instead guint.

diff --git a/ChangeLog b/ChangeLog
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c21a84a92163d730696e15395a85101c1630f432..adc429612890d4d98a94a07520367ec3d4974a86 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sat Sep 29 02:33:14 2001  George Lebl <jirka@5z.com>
+
+       * tests/testglib.c (main): cast the string size to gulong and use %lu
+         for printing to avoid 64bit issues
+
+       * glib/gstrfuncs.[ch] (g_ascii_strncasecmp): Change the 'n' argument 
+         to gsize instead guint.
+
 Fri Sep 28 19:41:32 2001  Owen Taylor  <otaylor@redhat.com>
 
        * glib/libcharset/* configure.in: Fix macros from libcharset

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 9d1cf4fa757138308c7dbd7ced6b070c8f51db01..5fea8091b13590ba2c0a0a567397eec07af38771 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -1268,7 +1268,7 @@ g_ascii_strcasecmp (const gchar *s1,
 gint
 g_ascii_strncasecmp (const gchar *s1,
                     const gchar *s2,
-                    guint n)
+                    gsize n)
 {
   gint c1, c2;
 

diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 2f5bfbfd4689e0d7b97a9f58073bbe3152f5fa50..7aedde13440aa3804b4d74616adae0b28fd6ad85 100644 (file)
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -129,7 +129,7 @@ gint                  g_ascii_strcasecmp  (const gchar *s1,
                                           const gchar *s2);
 gint                  g_ascii_strncasecmp (const gchar *s1,
                                           const gchar *s2,
-                                          guint        n);
+                                          gsize        n);
 gchar*                g_ascii_strdown     (const gchar *str,
                                           gssize       len);
 gchar*                g_ascii_strup       (const gchar *str,

diff --git a/tests/testglib.c b/tests/testglib.c
index 1302b599746929e598a7505b40548f31f7de9059..865225e7dcde2541bd8c70b778ae0b754e44e985 100644 (file)
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -823,7 +823,7 @@ main (int   argc,
                    10, 666, 15, 15, 666.666666666, 666.666666666);
 #endif
 
-  g_print ("string2 length = %d...\n", string2->len);
+  g_print ("string2 length = %lu...\n", (gulong)string2->len);
   string2->str[70] = '\0';
   g_print ("first 70 chars:\n%s\n", string2->str);
   string2->str[141] = '\0';