renamed function to allocate and copy memory

[rocksndiamonds.git] / src / libgame / misc.c

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index c96fa177de8ad5ebfb50cb7daa3242db7654ebe7..ed22f2c09544dcdd8ed45818a44bf7349edd024f 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -1084,24 +1084,6 @@ char *getBasePath(char *filename)
 }
 
 
-// ----------------------------------------------------------------------------
-// various string functions
-// ----------------------------------------------------------------------------
-
-void *getMemCopy(const void *m, size_t size)
-{
-  void *m_copy;
-
-  if (m == NULL)
-    return NULL;
-
-  m_copy = checked_malloc(size);
-  memcpy(m_copy, m, size);
-
-  return m_copy;
-}
-
-
 // ----------------------------------------------------------------------------
 // various string functions
 // ----------------------------------------------------------------------------
@@ -1441,6 +1423,44 @@ char *getUnescapedString(const char *s)
   return s_unescaped;
 }
 
+char *chugString(char *s)
+{
+  if (s == NULL)
+    return NULL;
+
+  char *start;
+
+  for (start = (char *)s; *start && isspace(*start); start++)
+    ;
+
+  memmove(s, start, strlen(start) + 1);
+
+  return s;
+}
+
+char *chompString(char *s)
+{
+  if (s == NULL)
+    return NULL;
+
+  int len = strlen(s);
+
+  while (len--)
+  {
+    if (isspace(s[len]))
+      s[len] = '\0';
+    else
+      break;
+  }
+
+  return s;
+}
+
+char *stripString(char *s)
+{
+  return chugString(chompString(s));
+}
+
 boolean strEqual(const char *s1, const char *s2)
 {
   return (s1 == NULL && s2 == NULL ? TRUE  :
@@ -1864,6 +1884,19 @@ void clear_mem(void *ptr, unsigned int size)
 #endif
 }
 
+void *get_memcpy(const void *m, size_t size)
+{
+  void *m_copy;
+
+  if (m == NULL)
+    return NULL;
+
+  m_copy = checked_malloc(size);
+  memcpy(m_copy, m, size);
+
+  return m_copy;
+}
+
 
 // ----------------------------------------------------------------------------
 // various helper functions