completed tor's fix to cover both #ifdef branches.

Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>

        * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
        to cover both #ifdef branches.

diff --git a/ChangeLog b/ChangeLog
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a161d76..1f3fea9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Jul 27 05:15:11 2000  Tim Janik  <timj@gtk.org>
+
+       * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix
+       to cover both #ifdef branches.
+
 2000-07-26  Tor Lillqvist  <tml@iki.fi>
 
        * gstrfuncs.c (g_strlcpy, g_strlcat): Return 0 on error, not NULL.

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 92f16eb..2a0a31d 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -814,8 +814,8 @@ g_strlcpy (gchar       *dest,
           const gchar *src,
           gsize        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);
   
   return strlcpy (dest, src, dest_size);
 }
@@ -825,8 +825,8 @@ g_strlcat (gchar       *dest,
           const gchar *src,
           gsize        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);
   
   return strlcat (dest, src, dest_size);
 }

diff --git a/gstrfuncs.c b/gstrfuncs.c
index 92f16eb..2a0a31d 100644 (file)
--- a/gstrfuncs.c
+++ b/gstrfuncs.c
@@ -814,8 +814,8 @@ g_strlcpy (gchar       *dest,
           const gchar *src,
           gsize        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);
   
   return strlcpy (dest, src, dest_size);
 }
@@ -825,8 +825,8 @@ g_strlcat (gchar       *dest,
           const gchar *src,
           gsize        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);
   
   return strlcat (dest, src, dest_size);
 }