This fixes the clang warnings in bin/ed. One extra pair of parentheses
and stop passing empty format strings to printf-family functions.
ok?
Index: glbl.c
===================================================================
RCS file: /cvs/src/bin/ed/glbl.c,v
retrieving revision 1.18
diff -u -p -r1.18 glbl.c
--- glbl.c 22 Mar 2016 17:58:28 -0000 1.18
+++ glbl.c 26 Apr 2017 19:47:43 -0000
@@ -67,7 +67,7 @@ build_active_list(int isgcmd)
return ERR;
if (isbinary)
NUL_TO_NEWLINE(s, lp->len);
- if (!regexec(pat, s, 0, NULL, 0) == isgcmd &&
+ if ((!regexec(pat, s, 0, NULL, 0)) == isgcmd &&
set_active_node(lp) < 0)
return ERR;
}
Index: io.c
===================================================================
RCS file: /cvs/src/bin/ed/io.c,v
retrieving revision 1.19
diff -u -p -r1.19 io.c
--- io.c 22 Mar 2016 17:58:28 -0000 1.19
+++ io.c 26 Apr 2017 19:49:57 -0000
@@ -63,7 +63,8 @@ read_file(char *fn, int n)
seterrmsg("cannot close input file");
return ERR;
}
- fprintf(stderr, !scripted ? "%d\n" : "", size);
+ if (!scripted)
+ fprintf(stderr, "%d\n", size);
return current_addr - n;
}
@@ -164,7 +165,8 @@ write_file(char *fn, char *mode, int n,
seterrmsg("cannot close output file");
return ERR;
}
- fprintf(stderr, !scripted ? "%d\n" : "", size);
+ if (!scripted)
+ fprintf(stderr, "%d\n", size);
return n ? m - n + 1 : 0;
}
Index: main.c
===================================================================
RCS file: /cvs/src/bin/ed/main.c,v
retrieving revision 1.59
diff -u -p -r1.59 main.c
--- main.c 3 Jan 2017 20:24:29 -0000 1.59
+++ main.c 26 Apr 2017 19:59:58 -0000
@@ -218,9 +218,10 @@ top:
fputs("?\n", stderr);
seterrmsg("warning: file modified");
if (!interactive) {
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" :
- "", lineno, errmsg);
+ if (garrulous)
+ fprintf(stderr,
+ "script, line %d: %s\n",
+ lineno, errmsg);
quit(2);
}
clearerr(stdin);
@@ -252,28 +253,30 @@ top:
fputs("?\n", stderr); /* give warning */
seterrmsg("warning: file modified");
if (!interactive) {
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" :
- "", lineno, errmsg);
+ if (garrulous)
+ fprintf(stderr,
+ "script, line %d: %s\n",
+ lineno, errmsg);
quit(2);
}
break;
case FATAL:
- if (!interactive)
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" : "",
- lineno, errmsg);
- else
- fprintf(stderr, garrulous ? "%s\n" : "",
- errmsg);
+ if (!interactive) {
+ if (garrulous)
+ fprintf(stderr,
+ "script, line %d: %s\n",
+ lineno, errmsg);
+ } else if (garrulous)
+ fprintf(stderr, "%s\n", errmsg);
quit(3);
break;
default:
fputs("?\n", stderr);
if (!interactive) {
- fprintf(stderr, garrulous ?
- "script, line %d: %s\n" : "",
- lineno, errmsg);
+ if (garrulous)
+ fprintf(stderr,
+ "script, line %d: %s\n",
+ lineno, errmsg);
quit(2);
}
break;
--
Christian "naddy" Weisgerber [email protected]
