libdeng1: Cleanup

skyjake · Jan 5, 2013 · 7b89504 · 7b89504
1 parent b4adfbf
commit 7b89504
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 27 deletions.
diff --git a/doomsday/libdeng/include/de/str.h b/doomsday/libdeng/include/de/str.h
@@ -509,16 +509,16 @@ DENG_PUBLIC void M_Strip(char* str, size_t len);
 
 DENG_PUBLIC char* M_SkipLine(char* str);
 
+DENG_PUBLIC char* M_StrCat(char* buf, const char* str, size_t bufSize);
+
+DENG_PUBLIC char* M_StrnCat(char* buf, const char* str, size_t nChars, size_t bufSize);
+
 /**
  * Concatenates src to dest as a quoted string. " is escaped to \".
  * Returns dest.
  */
 DENG_PUBLIC char* M_StrCatQuoted(char* dest, const char* src, size_t len);
 
-DENG_PUBLIC char* M_StrCat(char* buf, const char* str, size_t bufSize);
-
-DENG_PUBLIC char* M_StrnCat(char* buf, const char* str, size_t nChars, size_t bufSize);
-
 DENG_PUBLIC char* M_LimitedStrCat(char* buf, const char* str, size_t maxWidth, char separator, size_t bufLength);
 
 /**

diff --git a/doomsday/libdeng/src/str.c b/doomsday/libdeng/src/str.c
@@ -976,29 +976,6 @@ char* M_SkipLine(char* str)
     return str;
 }
 
-char* M_StrCatQuoted(char* dest, const char* src, size_t len)
-{
-    size_t k = strlen(dest) + 1, i;
-
-    strncat(dest, "\"", len);
-    for(i = 0; src[i]; i++)
-    {
-        if(src[i] == '"')
-        {
-            strncat(dest, "\\\"", len);
-            k += 2;
-        }
-        else
-        {
-            dest[k++] = src[i];
-            dest[k] = 0;
-        }
-    }
-    strncat(dest, "\"", len);
-
-    return dest;
-}
-
 boolean M_IsStringValidInt(const char* str)
 {
     size_t i, len;
@@ -1095,6 +1072,29 @@ char* M_StrnCat(char* buf, const char* str, size_t nChars, size_t bufSize)
     return strncat(buf, str, n);
 }
 
+char* M_StrCatQuoted(char* dest, const char* src, size_t len)
+{
+    size_t k = strlen(dest) + 1, i;
+
+    strncat(dest, "\"", len);
+    for(i = 0; src[i]; i++)
+    {
+        if(src[i] == '"')
+        {
+            strncat(dest, "\\\"", len);
+            k += 2;
+        }
+        else
+        {
+            dest[k++] = src[i];
+            dest[k] = 0;
+        }
+    }
+    strncat(dest, "\"", len);
+
+    return dest;
+}
+
 char* M_LimitedStrCat(char* buf, const char* str, size_t maxWidth,
                       char separator, size_t bufLength)
 {