From 3ab16b3e40f5d99736a35776f4346e955fae199e Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Sun, 27 May 2001 15:58:28 +0000
Subject: [PATCH] Moved some string related functions from memory.c to string.c

---
 WINGs/ChangeLog |  1 +
 WINGs/memory.c  | 42 ------------------------------------------
 WINGs/string.c  | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/WINGs/ChangeLog b/WINGs/ChangeLog
index fc81e94a..1c35ef6d 100644
--- a/WINGs/ChangeLog
+++ b/WINGs/ChangeLog
@@ -1,5 +1,6 @@
 - fixed problem with WINGs based apps exiting with a "X_RotateProperties"
   related error when text was selected in a textfiled.
+- moved wstrdup(), wstrconcat() and wstrappend() from memory.c to string.c
 
 
 Changes since wmaker 0.64.0:
diff --git a/WINGs/memory.c b/WINGs/memory.c
index 21f2761e..dc75a0a6 100644
--- a/WINGs/memory.c
+++ b/WINGs/memory.c
@@ -220,45 +220,3 @@ wrelease(void *ptr)
 }
 
 
-char*
-wstrdup(char *str)
-{
-    assert(str!=NULL);
-
-    return strcpy(wmalloc(strlen(str)+1), str);
-}
-
-
-char*
-wstrconcat(char *str1, char *str2)
-{
-    char *str;
-
-    if (!str1)
-	return wstrdup(str2);
-    else if (!str2)
-	return wstrdup(str1);
-
-    str = wmalloc(strlen(str1)+strlen(str2)+1);
-    strcpy(str, str1);
-    strcat(str, str2);
-
-    return str;
-}
-
-
-char*
-wstrappend(char *dst, char *src)
-{
-    if (!dst)
-	return wstrdup(src);
-    else if (!src || *src==0)
-	return dst;
-
-    dst = wrealloc(dst, strlen(dst)+strlen(src)+1);
-    strcat(dst, src);
-
-    return dst;
-}
-
-
diff --git a/WINGs/string.c b/WINGs/string.c
index 7e9a7d43..83f30faa 100644
--- a/WINGs/string.c
+++ b/WINGs/string.c
@@ -175,4 +175,46 @@ wtrimspace(char *s)
 }
 
 
+char*
+wstrdup(char *str)
+{
+    assert(str!=NULL);
+
+    return strcpy(wmalloc(strlen(str)+1), str);
+}
+
+
+char*
+wstrconcat(char *str1, char *str2)
+{
+    char *str;
+
+    if (!str1)
+	return wstrdup(str2);
+    else if (!str2)
+	return wstrdup(str1);
+
+    str = wmalloc(strlen(str1)+strlen(str2)+1);
+    strcpy(str, str1);
+    strcat(str, str2);
+
+    return str;
+}
+
+
+char*
+wstrappend(char *dst, char *src)
+{
+    if (!dst)
+	return wstrdup(src);
+    else if (!src || *src==0)
+	return dst;
+
+    dst = wrealloc(dst, strlen(dst)+strlen(src)+1);
+    strcat(dst, src);
+
+    return dst;
+}
+
+
 
-- 
2.11.4.GIT