From 864d4be8ca86540af1553bd42b3dbc9e78641083 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Thu, 27 Jul 2000 03:16:15 +0000 Subject: [PATCH] completed tor's fix to cover both #ifdef branches. Thu Jul 27 05:15:11 2000 Tim Janik * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix to cover both #ifdef branches. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gstrfuncs.c | 8 ++++---- gstrfuncs.c | 8 ++++---- 10 files changed, 48 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a161d76..1f3fea9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Jul 27 05:15:11 2000 Tim Janik + + * gstrfuncs.c (g_strlcpy, g_strlcat): completed tor's fix + to cover both #ifdef branches. + 2000-07-26 Tor Lillqvist * 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 --- 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 --- 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); } -- 2.7.4