Return 0 on error, not NULL.

2000-07-26  Tor Lillqvist  <tml@iki.fi>

	* gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

	* glib.def: Add g_strlcpy, g_strlcat.

	* glibconfig.h.win32.in: Add gsize and gssize.

diff --git a/ChangeLog b/ChangeLog
index afba197..a161d76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index afba197..a161d76 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-07-26  Tor Lillqvist  <tml@iki.fi>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.
+
+       * glib.def: Add g_strlcpy, g_strlcat.
+
+       * glibconfig.h.win32.in: Add gsize and gssize.
+
 Wed Jul 26 12:59:31 2000  Tim Janik  <timj@gtk.org>
 
        * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that

diff --git a/glib.def b/glib.def
index 479ff5f..e7fdb71 100644 (file)
--- a/glib.def
+++ b/glib.def
@@ -423,6 +423,8 @@ EXPORTS
        g_string_up
        g_strjoin
        g_strjoinv
+       g_strlcat
+       g_strlcpy
        g_strncasecmp
        g_strndup
        g_strnfill

diff --git a/glib/glib.def b/glib/glib.def
index 479ff5f..e7fdb71 100644 (file)
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -423,6 +423,8 @@ EXPORTS
        g_string_up
        g_strjoin
        g_strjoinv
+       g_strlcat
+       g_strlcpy
        g_strncasecmp
        g_strndup
        g_strnfill

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 707f357..92f16eb 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -850,8 +850,8 @@ g_strlcpy (gchar       *dest,
   register const gchar *s = src;
   register gsize n = dest_size;
   
-  g_return_val_if_fail (dest != NULL, NULL);
-  g_return_val_if_fail (src  != NULL, NULL);
+  g_return_val_if_fail (dest != NULL, 0);
+  g_return_val_if_fail (src  != NULL, 0);
   
   /* Copy as many bytes as will fit */
   if (n != 0 && --n != 0)
@@ -899,8 +899,8 @@ g_strlcat (gchar       *dest,
   register gsize bytes_left = dest_size;
   gsize dlength;  /* Logically, MIN (strlen (d), dest_size) */
   
-  g_return_val_if_fail (dest != NULL, NULL);
-  g_return_val_if_fail (src  != NULL, NULL);
+  g_return_val_if_fail (dest != NULL, 0);
+  g_return_val_if_fail (src  != NULL, 0);
   
   /* Find the end of dst and adjust bytes left but don't go past end */
   while (*d != 0 && bytes_left-- != 0)
@@ -1343,7 +1343,7 @@ g_filename_from_utf8 (const gchar *utf8string)
 {
 #ifdef G_OS_WIN32
 
-  gint i, mask, clen, wclen, mblen;
+  gint i, mask, clen, mblen;
   const gint len = strlen (utf8string);
   wchar_t *wcs, *wcp;
   gchar *result;

diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in
index 4c3be91..9680154 100644 (file)
--- a/glibconfig.h.win32.in
+++ b/glibconfig.h.win32.in
@@ -82,6 +82,9 @@ typedef unsigned long long guint64;
 #define G_GINT64_FORMAT "I64i"
 #define G_GUINT64_FORMAT "I64u"
 
+typedef gint32 gssize;
+typedef guint32 gsize;
+
 #define GPOINTER_TO_INT(p)     ((gint)(p))
 #define GPOINTER_TO_UINT(p)    ((guint)(p))
 

diff --git a/gstrfuncs.c b/gstrfuncs.c
index 707f357..92f16eb 100644 (file)
--- a/gstrfuncs.c
+++ b/gstrfuncs.c
@@ -850,8 +850,8 @@ g_strlcpy (gchar       *dest,
   register const gchar *s = src;
   register gsize n = dest_size;
   
-  g_return_val_if_fail (dest != NULL, NULL);
-  g_return_val_if_fail (src  != NULL, NULL);
+  g_return_val_if_fail (dest != NULL, 0);
+  g_return_val_if_fail (src  != NULL, 0);
   
   /* Copy as many bytes as will fit */
   if (n != 0 && --n != 0)
@@ -899,8 +899,8 @@ g_strlcat (gchar       *dest,
   register gsize bytes_left = dest_size;
   gsize dlength;  /* Logically, MIN (strlen (d), dest_size) */
   
-  g_return_val_if_fail (dest != NULL, NULL);
-  g_return_val_if_fail (src  != NULL, NULL);
+  g_return_val_if_fail (dest != NULL, 0);
+  g_return_val_if_fail (src  != NULL, 0);
   
   /* Find the end of dst and adjust bytes left but don't go past end */
   while (*d != 0 && bytes_left-- != 0)
@@ -1343,7 +1343,7 @@ g_filename_from_utf8 (const gchar *utf8string)
 {
 #ifdef G_OS_WIN32
 
-  gint i, mask, clen, wclen, mblen;
+  gint i, mask, clen, mblen;
   const gint len = strlen (utf8string);
   wchar_t *wcs, *wcp;
   gchar *result;