Rename safe{malloc,realloc} to safe_{malloc,realloc}

Author: LegalizeAdulthood

config/include/config/config2.h

@@ -16,8 +16,8 @@
 
 #ifdef USE_DEBUGGING_MALLOC
 #   include "malloc.h"
-#   define safemalloc malloc
-#   define saferealloc realloc
+#   define safe_malloc malloc
+#   define safe_realloc realloc
 #endif
 
 #include <string.h>

libtrn/edit_dist.cpp

@@ -8,7 +8,7 @@
 #include "config/common.h"             /* Declare MemorySize */
 #include "trn/edit_dist.h"
 
-#include "trn/util.h"               /* Declare safemalloc() */
+#include "trn/util.h"               /* Declare safe_malloc() */
 
 #include <algorithm>
 #include <cstdlib>

libtrn/rcln.cpp

@@ -353,7 +353,7 @@ void sub_art_num(DTASRC *dp, ART_NUM artnum, char *ngnam)
                     artnum = 0;
                 }
                 *(np->rcline + np->numoffset - 1) = np->subscribechar;
-                mbuf = safemalloc((MemorySize)(curlen+(artnum?(MAX_DIGITS+1)*2+1:1+1)));
+                mbuf = safe_malloc((MemorySize)(curlen+(artnum?(MAX_DIGITS+1)*2+1:1+1)));
                 *s = '\0';
                 std::strcpy(mbuf,np->rcline);        /* make new rc line */
                 s = mbuf + (s - np->rcline);

libtrn/sacmd.cpp

@@ -629,7 +629,7 @@ int sa_do_cmd()
         }
         if (!sa_extracted_use)
         {
-            sa_extracted_use = safemalloc(LBUFLEN);
+            sa_extracted_use = safe_malloc(LBUFLEN);
 /* later consider a variable for the default command */
             *sa_extracted_use = '\0';
         }
@@ -650,7 +650,7 @@ int sa_do_cmd()
         }
         if (s_sa_extract_dest == nullptr)
         {
-            s_sa_extract_dest = (char*)safemalloc(LBUFLEN);
+            s_sa_extract_dest = (char*)safe_malloc(LBUFLEN);
             safecpy(s_sa_extract_dest,filexp("%p"),LBUFLEN);
         }
         if (*decode_dest != '/' && *decode_dest != '~' && *decode_dest != '%')

libtrn/terminal.cpp

@@ -394,7 +394,7 @@ void term_set(char *tcbuf)
     {
         if (tgetflag("nc") && *g_tc_UP)
         {
-            g_tc_CR = safemalloc((MemorySize)std::strlen(g_tc_UP)+2);
+            g_tc_CR = safe_malloc((MemorySize)std::strlen(g_tc_UP)+2);
             std::sprintf(g_tc_CR,"%s\r",g_tc_UP);
         }
         else

util/env.cpp

@@ -496,7 +496,7 @@ char *export_var(const char *nam, const char *val)
         {
 #ifndef lint
             char** tmpenv = (char**)    /* point our wand at memory */
-                safemalloc((MemorySize) (i+2) * sizeof(char*));
+                safe_malloc((MemorySize) (i+2) * sizeof(char*));
 #else
             char** tmpenv = nullptr;
 #endif /* lint */
@@ -511,14 +511,14 @@ char *export_var(const char *nam, const char *val)
 #ifndef lint
         else
         {
-            environ = (char**) saferealloc((char*) environ,
+            environ = (char**) safe_realloc((char*) environ,
                 (MemorySize) (i+2) * sizeof(char*));
                                         /* just expand it a bit */
         }
 #endif /* lint */
         environ[i+1] = nullptr; /* make sure it's null terminated */
     }
-    environ[i] = safemalloc((MemorySize)(namlen + std::strlen(val) + 2));
+    environ[i] = safe_malloc((MemorySize)(namlen + std::strlen(val) + 2));
                                         /* this may or may not be in */
                                         /* the old environ structure */
     std::sprintf(environ[i],"%s=%s",nam,val);/* all that work just for this */