X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9514ca81bd12a47df977822efc14ff285bd5bc10..28ec221002d755d33c41fa4b5d9673eee0abef9d:/sbr/fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index f4c8d5dc..b0ce6462 100644
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -365,7 +365,7 @@ compile_error(char *str, char *cp)
     int i, errpos, errctx;
 
     errpos = cp - format_string;
-    errctx = errpos > 20 ? 20 : errpos;
+    errctx = min(errpos, 20);
     usr_fstring[errpos] = '\0';
 
     for (i = errpos-errctx; i < errpos; i++) {
@@ -998,7 +998,7 @@ fmt_findcasecomp(char *component)
     struct comp *cm;
 
     for (cm = wantcomp[CHASH(component)]; cm; cm = cm->c_next)
-	if (strcasecmp(component, cm->c_name ? cm->c_name : "") == 0)
+	if (strcasecmp(component, FENDNULL(cm->c_name)) == 0)
 	    break;
 
     return cm;
@@ -1050,7 +1050,7 @@ fmt_addcomptext(char *component, char *text)
     char *cp;
 
     while (cptr) {
-	if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0) {
+	if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0) {
 	    found++;
 	    if (! cptr->c_text) {
 		cptr->c_text = getcpy(text);
@@ -1085,7 +1085,7 @@ fmt_appendcomp(int bucket, char *component, char *text)
 
     if (bucket != -1) {
     	for (cptr = wantcomp[bucket]; cptr; cptr = cptr->c_next)
-	    if (strcasecmp(component, cptr->c_name ? cptr->c_name : "") == 0)
+	    if (strcasecmp(component, FENDNULL(cptr->c_name)) == 0)
 	    	cptr->c_text = add(text, cptr->c_text);
     }
 }