Rename MEM_SIZE to MemorySize

Author: LegalizeAdulthood

libtrn/edit_dist.cpp

@@ -5,7 +5,7 @@
  * is at the user's own risk.
  */
 
-#include "config/common.h"             /* Declare MEM_SIZE */
+#include "config/common.h"             /* Declare MemorySize */
 #include "trn/edit_dist.h"
 
 #include "trn/util.h"               /* Declare safemalloc() */

libtrn/rcln.cpp

@@ -353,7 +353,7 @@ void subartnum(DTASRC *dp, ART_NUM artnum, char *ngnam)
                     artnum = 0;
                 }
                 *(np->rcline + np->numoffset - 1) = np->subscribechar;
-                mbuf = safemalloc((MEM_SIZE)(curlen+(artnum?(MAX_DIGITS+1)*2+1:1+1)));
+                mbuf = safemalloc((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/terminal.cpp

@@ -394,7 +394,7 @@ void term_set(char *tcbuf)
     {
         if (tgetflag("nc") && *g_tc_UP)
         {
-            g_tc_CR = safemalloc((MEM_SIZE)std::strlen(g_tc_UP)+2);
+            g_tc_CR = safemalloc((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((MEM_SIZE) (i+2) * sizeof(char*));
+                safemalloc((MemorySize) (i+2) * sizeof(char*));
 #else
             char** tmpenv = nullptr;
 #endif /* lint */
@@ -512,13 +512,13 @@ char *export_var(const char *nam, const char *val)
         else
         {
             environ = (char**) saferealloc((char*) environ,
-                (MEM_SIZE) (i+2) * sizeof(char*));
+                (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((MEM_SIZE)(namlen + std::strlen(val) + 2));
+    environ[i] = safemalloc((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 */