X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d9c11dfca8a175c98add7e00ce7a39a5fefb7e8c..2a6df06eae308f5cdde1b5fb0d004a60a1b0ebe5:/uip/mhlsbr.c

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index ac5dc89a..329ad79e 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -306,13 +306,6 @@ static char delim4[] = "\n------------------------------\n\n";
 
 static FILE *(*mhl_action) () = (FILE *(*) ()) 0;
 
-/*
- * Redefine a couple of functions.
- * These are undefined later in the code.
- */
-#define	adios mhladios
-#define	done  mhldone
-
 /*
  * prototypes
  */
@@ -367,17 +360,17 @@ mhl (int argc, char **argv)
 	    switch (smatch (++cp, mhlswitches)) {
 		case AMBIGSW: 
 		    ambigsw (cp, mhlswitches);
-		    done (1);
+		    mhldone (1);
 		case UNKWNSW: 
-		    adios (NULL, "-%s unknown\n", cp);
+		    mhladios (NULL, "-%s unknown\n", cp);
 
 		case HELPSW: 
 		    snprintf (buf, sizeof(buf), "%s [switches] [files ...]", invo_name);
 		    print_help (buf, mhlswitches, 1);
-		    done (0);
+		    mhldone (0);
 		case VERSIONSW:
 		    print_version(invo_name);
-		    done (0);
+		    mhldone (0);
 
 		case BELLSW: 
 		    bellflg = 1;
@@ -395,23 +388,23 @@ mhl (int argc, char **argv)
 
 		case FOLDSW: 
 		    if (!(folder = *argp++) || *folder == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 		case FORMSW: 
 		    if (!(form = *argp++) || *form == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 
 		case SLEEPSW:
 		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    else
 			sleepsw = atoi (cp);/* ZERO ok! */
 		    continue;
 
 		case PROGSW:
 		    if (!(moreproc = *argp++) || *moreproc == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 		case NPROGSW:
 		    nomore++;
@@ -419,7 +412,7 @@ mhl (int argc, char **argv)
 
 		case FMTPROCSW:
 		    if (!(formatproc = *argp++) || *formatproc == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 		case NFMTPROCSW:
 		    formatproc = NULL;
@@ -427,32 +420,32 @@ mhl (int argc, char **argv)
 
 		case LENSW: 
 		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    else if ((length = atoi (cp)) < 1)
-			adios (NULL, "bad argument %s %s", argp[-2], cp);
+			mhladios (NULL, "bad argument %s %s", argp[-2], cp);
 		    continue;
 		case WIDTHSW: 
 		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    else if ((width = atoi (cp)) < 1)
-			adios (NULL, "bad argument %s %s", argp[-2], cp);
+			mhladios (NULL, "bad argument %s %s", argp[-2], cp);
 		    continue;
 
 		case DGSTSW: 
 		    if (!(digest = *argp++) || *digest == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    continue;
 		case ISSUESW:
 		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    else if ((issue = atoi (cp)) < 1)
-			adios (NULL, "bad argument %s %s", argp[-2], cp);
+			mhladios (NULL, "bad argument %s %s", argp[-2], cp);
 		    continue;
 		case VOLUMSW:
 		    if (!(cp = *argp++) || *cp == '-')
-			adios (NULL, "missing argument to %s", argp[-2]);
+			mhladios (NULL, "missing argument to %s", argp[-2]);
 		    else if ((volume = atoi (cp)) < 1)
-			adios (NULL, "bad argument %s %s", argp[-2], cp);
+			mhladios (NULL, "bad argument %s %s", argp[-2], cp);
 		    continue;
 
 		case FORW2SW: 
@@ -530,7 +523,7 @@ mhl (int argc, char **argv)
 
     fflush(stdout);
     if(ferror(stdout)){
-	    adios("output", "error writing");
+	    mhladios("output", "error writing");
     }
     
     if (clearflg > 0 && ontty == NOTTY)
@@ -566,7 +559,7 @@ mhl_format (char *file, int length, int width)
     }
 
     if ((fp = fopen (etcpath (file), "r")) == NULL)
-	adios (file, "unable to open format file");
+	mhladios (file, "unable to open format file");
 
     if (fstat (fileno (fp), &st) != NOTOK) {
 	mtime = st.st_mtime;
@@ -592,7 +585,7 @@ mhl_format (char *file, int length, int width)
 	if (*bp == ';')
 	    continue;
 
-        TrimSuffixC(bp, '\n');
+        trim_suffix_c(bp, '\n');
 
 	if (*bp == ':') {
 	    (void) add_queue (&fmthd, &fmttl, NULL, bp + 1, CLEARTEXT);
@@ -629,7 +622,7 @@ mhl_format (char *file, int length, int width)
 		parptr = bp;
 		while (*parptr) {
 		    if (evalvar (&global))
-			adios (NULL, "format file syntax error: %s", bp);
+			mhladios (NULL, "format file syntax error: %s", bp);
 		    if (*parptr)
 			parptr++;
 		}
@@ -640,7 +633,7 @@ mhl_format (char *file, int length, int width)
 		while (*parptr == ':' || *parptr == ',') {
 		    parptr++;
 		    if (evalvar (c1))
-			adios (NULL, "format file syntax error: %s", bp);
+			mhladios (NULL, "format file syntax error: %s", bp);
 		}
 		if (!c1->c_nfs && global.c_nfs) {
 		    if (c1->c_flags & DATEFMT) {
@@ -660,7 +653,7 @@ mhl_format (char *file, int length, int width)
 		continue;
 
 	    default: 
-		adios (NULL, "format file syntax error: %s", bp);
+		mhladios (NULL, "format file syntax error: %s", bp);
 	}
     }
     fclose (fp);
@@ -1107,7 +1100,7 @@ mhlfile (FILE *fp, char *mname, int ofilen, int ofilec)
 		return;
 
 	    default: 
-		adios (NULL, "getfld() returned %d", state);
+		mhladios (NULL, "getfld() returned %d", state);
 	}
     }
 }
@@ -1310,7 +1303,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
     if ((ovtxt = c1->c_ovtxt ? c1->c_ovtxt : global.c_ovtxt) == NULL)
 	ovtxt = "";
     if (wid < ovoff + strlen (ovtxt) + 5)
-	adios (NULL, "component: %s width(%d) too small for overflow(%d)",
+	mhladios (NULL, "component: %s width(%d) too small for overflow(%d)",
 		c1->c_name, wid, ovoff + strlen (ovtxt) + 5);
     onelp = NULL;
 
@@ -1337,7 +1330,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 
     if (!(c1->c_flags & HDROUTPUT) && !(c1->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)		/* uppercase component also */
-            ToUpper(text);
+            to_upper(text);
 	putstr(text, c1->c_flags);
 	if (flag != BODYCOMP) {
 	    putstr (": ", c1->c_flags);
@@ -1357,7 +1350,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 	    && !(c2->c_flags & HDROUTPUT)
 	    && !(c2->c_flags & NOCOMPONENT)) {
         if (c1->c_flags & UPPERCASE)
-            ToUpper(c2->c_name);
+            to_upper(c2->c_name);
 	putstr (c2->c_name, c1->c_flags);
 	putstr (": ", c1->c_flags);
 	if (!(c1->c_flags & SPLIT))
@@ -1369,7 +1362,7 @@ putcomp (struct mcomp *c1, struct mcomp *c2, int flag)
 		putstr (" ", c1->c_flags);
     }
     if (c1->c_flags & UPPERCASE)
-        ToUpper(c2->c_text);
+        to_upper(c2->c_text);
 
     count = 0;
     if (cchdr) {
@@ -1486,7 +1479,7 @@ putstr (char *string, unsigned long flags)
     lm = 0;
 
 #ifdef MULTIBYTE_SUPPORT
-    (void) mbtowc (NULL, NULL, 0); /* reset shift state */
+    if (mbtowc (NULL, NULL, 0)) {} /* reset shift state */
     char_len = 0;
 #else
     NMH_UNUSED (char_len);
@@ -1624,7 +1617,7 @@ pipeser (int i)
 {
     NMH_UNUSED (i);
 
-    done (NOTOK);
+    mhldone (NOTOK);
 }
 
 
@@ -1635,13 +1628,10 @@ quitser (int i)
 
     putchar ('\n');
     fflush (stdout);
-    done (NOTOK);
+    mhldone (NOTOK);
 }
 
 
-#undef adios
-#undef done
-
 static void
 mhladios (char *what, char *fmt, ...)
 {