From 1e315f896d9496e22546304ef8b2de74b9451fc4 Mon Sep 17 00:00:00 2001 From: Ori Bernstein Date: Mon, 10 Aug 2020 19:35:05 -0700 Subject: [PATCH] aux/ms2, aux/na: fix warnings aux/na was comparing the return of putc with <0, when it should have been comparing against EOF, which is not specified as -ve. aux/ms2 was zero-extending the mask for the address when it should have been sign extended. --- sys/src/cmd/aux/ms2.c | 2 +- sys/src/cmd/aux/na/na.y | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/src/cmd/aux/ms2.c b/sys/src/cmd/aux/ms2.c index 38ba774d4..be30fbf66 100644 --- a/sys/src/cmd/aux/ms2.c +++ b/sys/src/cmd/aux/ms2.c @@ -18,7 +18,7 @@ int binary; int halfswap; int srec = 2; uvlong addr; -ulong psize = 4096; +uvlong psize = 4096; Biobuf stdout; Fhdr exech; Biobuf *bio; diff --git a/sys/src/cmd/aux/na/na.y b/sys/src/cmd/aux/na/na.y index 6350186d7..adb27b8fc 100644 --- a/sys/src/cmd/aux/na/na.y +++ b/sys/src/cmd/aux/na/na.y @@ -826,7 +826,7 @@ yyerror(char *s, ...) va_start(ap, s); fprintf(stderr, "%s: %d: ", yyfilename, yyline); vfprintf(stderr, s, ap); - if (putc('\n', stderr) < 0) + if (putc('\n', stderr) == EOF) exits("io"); errors++; va_end(ap); @@ -840,7 +840,7 @@ yywarn(char *s, ...) va_start(ap, s); fprintf(stderr, "%s: %d: warning: ", yyfilename, yyline); vfprintf(stderr, s, ap); - if (putc('\n', stderr) < 0) + if (putc('\n', stderr) == EOF) exits("io"); warnings++; va_end(ap);