summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/config/config.y4
-rw-r--r--usr.sbin/fdread/fdread.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index adb6ff4..344a777 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -221,10 +221,8 @@ Opt_list:
Option:
Save_id
= {
- char *s;
-
newopt(&opt, $1, NULL);
- if ((s = strchr($1, '=')))
+ if (strchr($1, '=') != NULL)
errx(1, "%s:%d: The `=' in options should not be "
"quoted", yyfile, yyline);
} |
diff --git a/usr.sbin/fdread/fdread.c b/usr.sbin/fdread/fdread.c
index 8135170..2539b3a 100644
--- a/usr.sbin/fdread/fdread.c
+++ b/usr.sbin/fdread/fdread.c
@@ -300,7 +300,7 @@ doread(int fd, FILE *of, const char *_devname)
int
doreadid(int fd, unsigned int numids, unsigned int trackno)
{
- int rv = 0, status, fdopts;
+ int rv = 0, fdopts;
unsigned int i;
struct fdc_readid info;
struct fdc_status fdcs;
@@ -316,7 +316,7 @@ doreadid(int fd, unsigned int numids, unsigned int trackno)
for (i = 0; i < numids; i++) {
info.cyl = trackno / fdt.heads;
info.head = fdt.heads > 1? trackno % fdt.heads: 0;
- if ((status = ioctl(fd, FD_READID, &info)) == 0) {
+ if (ioctl(fd, FD_READID, &info) == 0) {
printf("C = %d, H = %d, R = %d, N = %d\n",
info.cyl, info.head, info.sec, info.secshift);
} else {
OpenPOWER on IntegriCloud