X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib%2Fstr.c;h=451b8983fb8a11ea55fb21baebc50e267d6d2691;hb=ef7b80006ebb47372d69c64e8b2b2f0764333d55;hp=76eb2489900043269acf5a17d7a459dd8f246f82;hpb=a8477ebaa09990b3688164cbe5cf661c4189541d;p=apps%2Fmadmutt.git

diff --git a/lib/str.c b/lib/str.c
index 76eb248..451b898 100644
--- a/lib/str.c
+++ b/lib/str.c
@@ -21,10 +21,9 @@ char *str_dup (const char *s)
   char *p;
   size_t l;
 
-  if (!s || !*s)
-    return 0;
+  if (!s || !*s) return NULL;
   l = str_len (s) + 1;
-  p = (char *) safe_malloc (l);
+  p = (char *) mem_malloc (l);
   memcpy (p, s, l);
   return (p);
 }
@@ -99,7 +98,7 @@ int str_coll (const char *a, const char *b)
 
 void str_replace (char **p, const char *s)
 {
-  FREE (p);
+  mem_free (p);
   *p = str_dup (s);
 }
 
@@ -107,7 +106,7 @@ void str_adjust (char **p)
 {
   if (!p || !*p)
     return;
-  safe_realloc (p, str_len (*p) + 1);
+  mem_realloc (p, str_len (*p) + 1);
 }
 
 /* convert all characters in the string to lowercase */
@@ -148,7 +147,7 @@ char *str_substrdup (const char *begin, const char *end)
   else
     len = str_len (begin);
 
-  p = safe_malloc (len + 1);
+  p = mem_malloc (len + 1);
   memcpy (p, begin, len);
   p[len] = 0;
   return p;