From d4daf998edd19ce80ef1d33b717df429020f8ba4 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Tue, 20 Sep 1994 06:24:56 +0000 Subject: [PATCH] Applied patch to make -Wall and -Dlint shut up. Reviewed by: phk Submitted by: Josef Grosch --- bin/dd/args.c | 2 +- bin/dd/conv.c | 7 ++++--- bin/domainname/domainname.c | 8 +++++--- bin/mkdir/mkdir.c | 7 ++++--- bin/sync/sync.c | 4 +++- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/bin/dd/args.c b/bin/dd/args.c index 3c2f3a255ff7..06409724f71a 100644 --- a/bin/dd/args.c +++ b/bin/dd/args.c @@ -98,7 +98,7 @@ jcl(argv) in.dbsz = out.dbsz = 512; - while (oper = *++argv) { + while ((oper = *++argv)) {/* JEAG */ if ((arg = strchr(oper, '=')) == NULL) errx(1, "unknown operand %s", oper); *arg++ = '\0'; diff --git a/bin/dd/conv.c b/bin/dd/conv.c index 69fa8cf13052..02c2a6462311 100644 --- a/bin/dd/conv.c +++ b/bin/dd/conv.c @@ -59,7 +59,7 @@ def() int cnt; u_char *inp, *t; - if (t = ctab) + if ((t = ctab)) for (inp = in.dbp - (cnt = in.dbrcnt); cnt--; ++inp) *inp = t[*inp]; @@ -103,6 +103,7 @@ block() int ch, cnt, maxlen; u_char *inp, *outp, *t; + ch = 0; /* * Record truncation can cross block boundaries. If currently in a * truncation state, keep tossing characters until reach a newline. @@ -129,7 +130,7 @@ block() */ for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) { maxlen = MIN(cbsz, in.dbcnt); - if (t = ctab) + if ((t = ctab)) for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n'; ++cnt) *outp++ = t[ch]; @@ -213,7 +214,7 @@ unblock() u_char *inp, *t; /* Translation and case conversion. */ - if (t = ctab) + if ((t = ctab)) for (cnt = in.dbrcnt, inp = in.dbp; cnt--;) *--inp = t[*inp]; /* diff --git a/bin/domainname/domainname.c b/bin/domainname/domainname.c index 8b1eb12805fd..aca4b89c88b7 100644 --- a/bin/domainname/domainname.c +++ b/bin/domainname/domainname.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)hostname.c 8.1 (Berkeley) 5/31/93"; */ static const char rcsid[] = - "$Id$"; + "$Id: domainname.c,v 1.1 1994/09/18 21:23:37 wollman Exp $"; #endif /* not lint */ #include @@ -51,13 +51,15 @@ static const char rcsid[] = #include #include +int getdomainname __P((char *, int)); +int setdomainname __P((const char *, int)); + int main(argc,argv) int argc; char *argv[]; { - extern int optind; - int ch, sflag; + int sflag; char *p, domainname[MAXHOSTNAMELEN]; sflag = 0; diff --git a/bin/mkdir/mkdir.c b/bin/mkdir/mkdir.c index 458ec79d8636..083a2af79759 100644 --- a/bin/mkdir/mkdir.c +++ b/bin/mkdir/mkdir.c @@ -60,10 +60,10 @@ main(argc, argv) char *argv[]; { int ch, exitval, oct, omode, pflag; - mode_t *set; + mode_t *set = (mode_t *)NULL; char *ep, *mode; - pflag = 0; + omode = pflag = 0; mode = NULL; while ((ch = getopt(argc, argv, "m:p")) != EOF) switch(ch) { @@ -123,10 +123,11 @@ build(path) char *p; p = path; + oumask = (mode_t)NULL; if (p[0] == '/') /* Skip leading '/'. */ ++p; for (first = 1;; ++p) { - if (p[0] == '\0' || p[0] == '/' && p[1] == '\0') + if (p[0] == '\0' || (p[0] == '/' && p[1] == '\0')) break; if (p[0] != '/') continue; diff --git a/bin/sync/sync.c b/bin/sync/sync.c index dd58649e98e6..23714f589382 100644 --- a/bin/sync/sync.c +++ b/bin/sync/sync.c @@ -41,7 +41,9 @@ static char copyright[] = static char sccsid[] = "@(#)sync.c 8.1 (Berkeley) 5/31/93"; #endif /* not lint */ -main() +void sync(); + +void main() { sync(); exit(0);