making lint happier

SCCS-vsn: usr.bin/rdist/docmd.c 4.11
SCCS-vsn: usr.bin/rdist/expand.c 4.9
SCCS-vsn: usr.bin/rdist/server.c 4.12

diff --git a/usr/src/usr.bin/rdist/docmd.c b/usr/src/usr.bin/rdist/docmd.c
index 764de87..68d1d4c 100644 (file)
--- a/usr/src/usr.bin/rdist/docmd.c
+++ b/usr/src/usr.bin/rdist/docmd.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)docmd.c     4.10 (Berkeley) 83/11/29";
+static char *sccsid = "@(#)docmd.c     4.11 (Berkeley) 83/12/19";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -89,7 +89,6 @@ dohcmds(files, hosts, cmds)
 makeconn(rhost)
        char *rhost;
 {
 makeconn(rhost)
        char *rhost;
 {

-       register struct block *c;

        register char *ruser, *cp;
        int n;
        extern char user[];
        register char *ruser, *cp;
        int n;
        extern char user[];


@@ -418,7 +417,6 @@ mkexceptlist(cmds)
        struct block *cmds;
 {
        register struct block *f, *a, *c;
        struct block *cmds;
 {
        register struct block *f, *a, *c;

-       register char *cp;

 
        if (debug)
                printf("mkexceptlist()\n");
 
        if (debug)
                printf("mkexceptlist()\n");

diff --git a/usr/src/usr.bin/rdist/expand.c b/usr/src/usr.bin/rdist/expand.c
index 6cd5165..8886045 100644 (file)
--- a/usr/src/usr.bin/rdist/expand.c
+++ b/usr/src/usr.bin/rdist/expand.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)expand.c    4.8 (Berkeley) 83/11/30";
+static char *sccsid = "@(#)expand.c    4.9 (Berkeley) 83/12/19";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -98,7 +98,7 @@ expstr(s)
 {
        register char *cp, *cp1;
        register struct block *tp;
 {
        register char *cp, *cp1;
        register struct block *tp;

-       char *tail, *opathp;
+       char *tail;

        char buf[BUFSIZ];
        int savec, oargc;
        extern char homedir[];
        char buf[BUFSIZ];
        int savec, oargc;
        extern char homedir[];


@@ -187,7 +187,6 @@ expstr(s)
        oargc = argc;
        expany = 0;
        expsh(s);
        oargc = argc;
        expany = 0;
        expsh(s);

-       pathp = opathp;

        if (argc != oargc)
                sort();
 }
        if (argc != oargc)
                sort();
 }

diff --git a/usr/src/usr.bin/rdist/server.c b/usr/src/usr.bin/rdist/server.c
index 606a2bd..c304430 100644 (file)
--- a/usr/src/usr.bin/rdist/server.c
+++ b/usr/src/usr.bin/rdist/server.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)server.c    4.11 (Berkeley) 83/12/09";
+static char *sccsid = "@(#)server.c    4.12 (Berkeley) 83/12/19";

 #endif
 
 #include "defs.h"
 #endif
 
 #include "defs.h"


@@ -27,8 +27,6 @@ server()
 {
        char cmdbuf[BUFSIZ];
        register char *cp;
 {
        char cmdbuf[BUFSIZ];
        register char *cp;

-       register struct block *bp = NULL;
-       int opts;

 
        oumask = umask(0);
        (void) sprintf(buf, "V%d\n", VERSION);
 
        oumask = umask(0);
        (void) sprintf(buf, "V%d\n", VERSION);


@@ -224,7 +222,6 @@ sendf(rname, opts)
        char *rname;
        int opts;
 {
        char *rname;
        int opts;
 {

-       register char *cp;

        register struct block *c;
        struct stat stb;
        int sizerr, f, u;
        register struct block *c;
        struct stat stb;
        int sizerr, f, u;


@@ -529,7 +526,7 @@ recvf(cmd, isdir)
        int isdir;
 {
        register char *cp;
        int isdir;
 {
        register char *cp;

-       int f, mode, opts, wrerr, olderrno, u;
+       int f, mode, opts, wrerr, olderrno;

        off_t i, size;
        time_t mtime;
        struct stat stb;
        off_t i, size;
        time_t mtime;
        struct stat stb;


@@ -620,14 +617,10 @@ recvf(cmd, isdir)
        new[0] = '\0';
        if (catname)
                (void) sprintf(tp, "/%s", cp);
        new[0] = '\0';
        if (catname)
                (void) sprintf(tp, "/%s", cp);

-       if (stat(target, &stb) == 0) {
-               if ((stb.st_mode & S_IFMT) != S_IFREG) {
-                       error("%s: not a regular file\n", target);
-                       return;
-               }
-               u = 2;
-       } else
-               u = 1;
+       if (stat(target, &stb) == 0 && (stb.st_mode & S_IFMT) != S_IFREG) {
+               error("%s: not a regular file\n", target);
+               return;
+       }

        if (chkparent(target) < 0)
                goto bad;
        cp = rindex(target, '/');
        if (chkparent(target) < 0)
                goto bad;
        cp = rindex(target, '/');


@@ -701,7 +694,8 @@ recvf(cmd, isdir)
                if (opts & VERIFY) {
                        (void) unlink(new);
                        buf[0] = '\0';
                if (opts & VERIFY) {
                        (void) unlink(new);
                        buf[0] = '\0';

-                       sprintf(buf + 1, "need to update %s:%s\n", host, target);
+                       (void) sprintf(buf + 1, "need to update %s:%s\n",
+                               host, target);

                        (void) write(rem, buf, strlen(buf + 1) + 1);
                        return;
                }
                        (void) write(rem, buf, strlen(buf + 1) + 1);
                        return;
                }


@@ -734,7 +728,7 @@ bad:
        }
        if (opts & COMPARE) {
                buf[0] = '\0';
        }
        if (opts & COMPARE) {
                buf[0] = '\0';

-               sprintf(buf + 1, "updated %s:%s\n", host, target);
+               (void) sprintf(buf + 1, "updated %s:%s\n", host, target);

                (void) write(rem, buf, strlen(buf + 1) + 1);
        } else
                ack();
                (void) write(rem, buf, strlen(buf + 1) + 1);
        } else
                ack();