Fix a use of strcat that wasn't replaced with g_stpcpy in the original

Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>

	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
	wasn't replaced with g_stpcpy in the original
	stpcpy-for-efficiency patch.

10 files changed, 50 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3444e6118..ed2ae30e2 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jun 14 14:09:46 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* gstrfuncs.c (g_strconcat): Fix a use of strcat that
+	wasn't replaced with g_stpcpy in the original 
+	stpcpy-for-efficiency patch.
+
 2001-06-11  Havoc Pennington  <hp@redhat.com>
 
 	* NEWS: updated
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index dd7dc4520..066cdb3d7 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -214,7 +214,7 @@ g_strconcat (const gchar *string1, ...)
   s = va_arg (args, gchar*);
   while (s)
     {
-      strcat (concat, s);
+      ptr = g_stpcpy (ptr, s);
       s = va_arg (args, gchar*);
     }
   va_end (args);
diff --git a/gstrfuncs.c b/gstrfuncs.c
index dd7dc4520..066cdb3d7 100644
--- a/gstrfuncs.c
+++ b/gstrfuncs.c
@@ -214,7 +214,7 @@ g_strconcat (const gchar *string1, ...)
   s = va_arg (args, gchar*);
   while (s)
     {
-      strcat (concat, s);
+      ptr = g_stpcpy (ptr, s);
       s = va_arg (args, gchar*);
     }
   va_end (args);