X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b1eb90d04f944d410bdb757006c9e9815034e85c..06efa573c7894caa4e5aa1ac7c64bd10ea25928b:/sbr/fmt_compile.c?ds=sidebyside

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 9cb92f8f..216b8e71 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -352,7 +352,7 @@ lookup(char *name)
 
     while ((nm = t->name)) {
 	if (*nm == c && strcmp (nm, name) == 0)
-	    return (ftbl = t);
+	    return ftbl = t;
 
 	t++;
     }
@@ -376,7 +376,7 @@ compile_error(char *str, char *cp)
 
     inform("\"%s\": format compile error - %s",
 	   &usr_fstring[errpos-errctx], str);
-    adios (NULL, "%*s", errctx+1, "^");
+    die("%*s", errctx+1, "^");
 }
 
 /*
@@ -390,14 +390,14 @@ fmt_compile(char *fstring, struct format **fmt, int reset_comptable)
 {
     char *cp;
     size_t i;
-    static int comptable_initialized = 0;
+    static bool comptable_initialized;
 
     format_string = mh_xstrdup(fstring);
     usr_fstring = fstring;
 
     if (reset_comptable || !comptable_initialized) {
     	free_comptable();
-	comptable_initialized = 1;
+	comptable_initialized = true;
     }
 
     /* it takes at least 4 char to generate one format so we
@@ -488,15 +488,13 @@ do_spec(char *sp)
 {
     char *cp = sp;
     int c;
-#ifndef	lint
-    int ljust = 0;
-#endif	/* not lint */
+    bool ljust = false;
     int wid = 0;
     char fill = ' ';
 
     c = *cp++;
     if (c == '-') {
-	ljust++;
+	ljust = true;
 	c = *cp++;
     }
     if (c == '0') {
@@ -545,7 +543,7 @@ do_name(char *sp, int preprocess)
     char *cp = sp;
     int c;
     int i;
-    static int primed = 0;
+    static bool primed;
 
     while (isalnum(c = *cp++) || c == '-' || c == '_')
 	;
@@ -575,7 +573,7 @@ do_name(char *sp, int preprocess)
     case FT_GETMYADDR:
 	if (!primed) {
 	    ismymbox(NULL);
-	    primed++;
+	    primed = true;
 	}
 	/* FALLTHRU */
     case FT_PARSEADDR:
@@ -1046,13 +1044,15 @@ fmt_addcompentry(char *component)
 int
 fmt_addcomptext(char *component, char *text)
 {
-    int i, found = 0, bucket = CHASH(component);
+    int i;
+    bool found = false;
+    int bucket = CHASH(component);
     struct comp *cptr = wantcomp[bucket];
     char *cp;
 
     while (cptr) {
 	if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {
-	    found++;
+	    found = true;
 	    if (! cptr->c_text) {
 		cptr->c_text = getcpy(text);
 	    } else {