X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/73e69ca3599cd99c7ad689773ea6623354a1a0f6..461317c8fb5ec758fd77d2d7450ca3cd94fc58c2:/sbr/fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index e97447bd..c8618ed8 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -290,7 +290,7 @@ static struct colormap colortable[] = {
 /* Add new component to the hash table */
 #define NEWCOMP(cm,name) do { \
 	NEW0(cm);\
-	cm->c_name = getcpy(name);\
+	cm->c_name = mh_xstrdup(name);\
 	cm->c_refcount++;\
 	ncomp++;\
 	i = CHASH(name);\
@@ -347,9 +347,9 @@ static void free_comptable(void);
 static struct ftable *
 lookup(char *name)
 {
-    register struct ftable *t = functable;
-    register char *nm;
-    register char c = *name;
+    struct ftable *t = functable;
+    char *nm;
+    char c = *name;
 
     while ((nm = t->name)) {
 	if (*nm == c && strcmp (nm, name) == 0)
@@ -389,11 +389,11 @@ compile_error(char *str, char *cp)
 int
 fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 {
-    register char *cp;
+    char *cp;
     size_t i;
     static int comptable_initialized = 0;
 
-    format_string = getcpy (fstring);
+    format_string = mh_xstrdup(fstring);
     usr_fstring = fstring;
 
     if (reset_comptable || !comptable_initialized) {
@@ -426,8 +426,8 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 static char *
 compile (char *sp)
 {
-    register char *cp = sp;
-    register int  c;
+    char *cp = sp;
+    int  c;
 
     for (;;) {
 	sp = cp;
@@ -487,13 +487,13 @@ compile (char *sp)
 static char *
 do_spec(char *sp)
 {
-    register char *cp = sp;
-    register int c;
+    char *cp = sp;
+    int c;
 #ifndef	lint
-    register int ljust = 0;
+    int ljust = 0;
 #endif	/* not lint */
-    register int wid = 0;
-    register char fill = ' ';
+    int wid = 0;
+    char fill = ' ';
 
     c = *cp++;
     if (c == '-') {
@@ -543,9 +543,9 @@ do_spec(char *sp)
 static char *
 do_name(char *sp, int preprocess)
 {
-    register char *cp = sp;
-    register int c;
-    register int i;
+    char *cp = sp;
+    int c;
+    int i;
     static int primed = 0;
 
     while (isalnum(c = *cp++) || c == '-' || c == '_')
@@ -606,10 +606,10 @@ do_name(char *sp, int preprocess)
 static char *
 do_func(char *sp)
 {
-    register char *cp = sp;
-    register int c;
-    register struct ftable *t;
-    register int n;
+    char *cp = sp;
+    int c;
+    struct ftable *t;
+    int n;
     int mflag;		/* minus sign in NUM */
 
     infunction++;
@@ -770,8 +770,8 @@ do_func(char *sp)
 static char *
 do_expr (char *sp, int preprocess)
 {
-    register char *cp = sp;
-    register int  c;
+    char *cp = sp;
+    int  c;
 
     if ((c = *cp++) == '{') {
 	cp = do_name (cp, preprocess);
@@ -831,7 +831,7 @@ do_expr (char *sp, int preprocess)
 static char *
 do_loop(char *sp)
 {
-    register char *cp = sp;
+    char *cp = sp;
     struct format *floop;
 
     floop = next_fp;
@@ -855,10 +855,10 @@ do_loop(char *sp)
 static char *
 do_if(char *sp)
 {
-    register char *cp = sp;
-    register struct format *fexpr,
+    char *cp = sp;
+    struct format *fexpr,
 			   *fif = (struct format *)NULL;
-    register int c = '<';
+    int c = '<';
 
     for (;;) {
 	if (c == '<') {			/* doing an IF */
@@ -969,11 +969,10 @@ fmt_freecomptext(void)
     struct comp *cm;
 
     for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
-    	for (cm = wantcomp[i]; cm; cm = cm->c_next)
-	    if (cm->c_text) {
-	    	free(cm->c_text);
-		cm->c_text = NULL;
-	    }
+        for (cm = wantcomp[i]; cm; cm = cm->c_next) {
+            mh_xfree(cm->c_text);
+            cm->c_text = NULL;
+        }
 }
 
 /*
@@ -1145,10 +1144,8 @@ free_component(struct comp *cm)
 {
     if (--cm->c_refcount <= 0) {
     	/* Shouldn't ever be NULL, but just in case ... */
-    	if (cm->c_name)
-	    free(cm->c_name);
-	if (cm->c_text)
-	    free(cm->c_text);
+        mh_xfree(cm->c_name);
+        mh_xfree(cm->c_text);
 	if (cm->c_type & CT_DATE)
 	    free(cm->c_tws);
 	if (cm->c_type & CT_ADDR && cm->c_mn && cm->c_mn != &fmt_mnull)