lint cleanup (fix sequence number problem)

SCCS-vsn: usr.sbin/timed/timed/master.c 2.11
SCCS-vsn: usr.sbin/timed/timed/measure.c 2.4
SCCS-vsn: usr.sbin/timed/timed/slave.c 2.15
SCCS-vsn: usr.sbin/timed/timed/timed.c 2.9

diff --git a/usr/src/usr.sbin/timed/timed/master.c b/usr/src/usr.sbin/timed/timed/master.c
index da6c79d..c7a40cc 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/master.c
+++ b/usr/src/usr.sbin/timed/timed/master.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)master.c   2.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)master.c   2.11 (Berkeley) %G%";

 #endif not lint
 
 #include "globals.h"
 #endif not lint
 
 #include "globals.h"


@@ -18,7 +18,7 @@ extern int machup;
 extern int measure_delta;
 extern jmp_buf jmpenv;
 
 extern int measure_delta;
 extern jmp_buf jmpenv;
 

-extern short sequence;
+extern u_short sequence;

 
 #ifdef MEASURE
 int header;
 
 #ifdef MEASURE
 int header;


@@ -497,6 +497,7 @@ struct netinfo *net;
 }
 
 newslave(ind, seq)
 }
 
 newslave(ind, seq)

+u_short seq;

 {
        struct tsp to;
        struct tsp *answer, *acksend();
 {
        struct tsp to;
        struct tsp *answer, *acksend();

diff --git a/usr/src/usr.sbin/timed/timed/measure.c b/usr/src/usr.sbin/timed/timed/measure.c
index a85b31a..c73e8bf 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/measure.c
+++ b/usr/src/usr.sbin/timed/timed/measure.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)measure.c  2.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)measure.c  2.4 (Berkeley) %G%";

 #endif not lint
 
 #include "globals.h"
 #endif not lint
 
 #include "globals.h"


@@ -108,7 +108,7 @@ empty:
                        if ((count = select(FD_SETSIZE, &ready, (fd_set *)0,
                            (fd_set *)0, &tout)) <= 0)
                                break;
                        if ((count = select(FD_SETSIZE, &ready, (fd_set *)0,
                            (fd_set *)0, &tout)) <= 0)
                                break;

-                       cc = recvfrom(sock_raw, packet, PACKET_IN, 0, 
+                       cc = recvfrom(sock_raw, (char *)packet, PACKET_IN, 0, 

                            (struct sockaddr_in *)NULL, &length);
                        (void)gettimeofday(&tv1, (struct timezone *)0);
                        if (cc < 0)
                            (struct sockaddr_in *)NULL, &length);
                        (void)gettimeofday(&tv1, (struct timezone *)0);
                        if (cc < 0)

diff --git a/usr/src/usr.sbin/timed/timed/slave.c b/usr/src/usr.sbin/timed/timed/slave.c
index e25f866..b22e07a 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/slave.c
+++ b/usr/src/usr.sbin/timed/timed/slave.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)slave.c    2.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)slave.c    2.15 (Berkeley) %G%";

 #endif not lint
 
 #include "globals.h"
 #endif not lint
 
 #include "globals.h"


@@ -14,7 +14,7 @@ static char sccsid[] = "@(#)slave.c   2.14 (Berkeley) %G%";
 
 extern jmp_buf jmpenv;
 
 
 extern jmp_buf jmpenv;
 

-extern short sequence;
+extern u_short sequence;

 
 slave()
 {
 
 slave()
 {


@@ -26,7 +26,7 @@ slave()
        struct tsp *msg, to, *readmsg();
        struct sockaddr_in saveaddr, msaveaddr;
        struct timeval wait;
        struct tsp *msg, to, *readmsg();
        struct sockaddr_in saveaddr, msaveaddr;
        struct timeval wait;

-       struct timeval time, mytime, otime;
+       struct timeval time, otime;

        struct tsp *answer, *acksend();
        int timeout();
        char *date();
        struct tsp *answer, *acksend();
        int timeout();
        char *date();

diff --git a/usr/src/usr.sbin/timed/timed/timed.c b/usr/src/usr.sbin/timed/timed/timed.c
index 517823a..3ec1653 100644 (file)
--- a/usr/src/usr.sbin/timed/timed/timed.c
+++ b/usr/src/usr.sbin/timed/timed/timed.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)timed.c    2.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)timed.c    2.9 (Berkeley) %G%";

 #endif not lint
 
 #include "globals.h"
 #endif not lint
 
 #include "globals.h"


@@ -32,6 +32,7 @@ int machup;
 u_short sequence;                      /* sequence number */
 long delay1;
 long delay2;
 u_short sequence;                      /* sequence number */
 long delay1;
 long delay2;

+long random();

 char hostname[MAXHOSTNAMELEN];
 struct host hp[NHOSTS];
 char tracefile[] = "/usr/adm/timed.log";
 char hostname[MAXHOSTNAMELEN];
 struct host hp[NHOSTS];
 char tracefile[] = "/usr/adm/timed.log";


@@ -77,7 +78,6 @@ char **argv;
        int nflag, iflag;
        struct timeval time;
        struct servent *srvp;
        int nflag, iflag;
        struct timeval time;
        struct servent *srvp;

-       struct tsp resp, conflict, *answer, *readmsg(), *acksend();

        long casual();
        char *date();
        int n;
        long casual();
        char *date();
        int n;


@@ -90,7 +90,7 @@ char **argv;
        struct netinfo *savefromnet;
        struct sockaddr_in server;
        u_short port;
        struct netinfo *savefromnet;
        struct sockaddr_in server;
        u_short port;

-       int havemaster = 0;
+       uid_t getuid();

 
 #ifdef lint
        ntip = NULL;
 
 #ifdef lint
        ntip = NULL;


@@ -127,7 +127,7 @@ char **argv;
                                    "timed: -i and -n make no sense together\n");
                                } else {
                                        nflag = ON;
                                    "timed: -i and -n make no sense together\n");
                                } else {
                                        nflag = ON;

-                                       addnetname(*argv, &nets);
+                                       addnetname(*argv);

                                }
                                while (*(++(*argv)+1)) ;
                                break;
                                }
                                while (*(++(*argv)+1)) ;
                                break;


@@ -138,7 +138,7 @@ char **argv;
                                    "timed: -i and -n make no sense together\n");
                                } else {
                                        iflag = ON;
                                    "timed: -i and -n make no sense together\n");
                                } else {
                                        iflag = ON;

-                                       addnetname(*argv, &nets);
+                                       addnetname(*argv);

                                }
                                while (*(++(*argv)+1)) ;
                                break;
                                }
                                while (*(++(*argv)+1)) ;
                                break;


@@ -219,7 +219,7 @@ char **argv;
        }
        ifc.ifc_len = sizeof(buf);
        ifc.ifc_buf = buf;
        }
        ifc.ifc_len = sizeof(buf);
        ifc.ifc_buf = buf;

-       if (ioctl(sock, (int)SIOCGIFCONF, (char *)&ifc) < 0) {
+       if (ioctl(sock, SIOCGIFCONF, (char *)&ifc) < 0) {

                syslog(LOG_ERR, "get interface configuration: %m");
                exit(1);
        }
                syslog(LOG_ERR, "get interface configuration: %m");
                exit(1);
        }


@@ -233,7 +233,7 @@ char **argv;
                        ntp = (struct netinfo *)malloc(sizeof(struct netinfo));
                ntp->my_addr = 
                        ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr;
                        ntp = (struct netinfo *)malloc(sizeof(struct netinfo));
                ntp->my_addr = 
                        ((struct sockaddr_in *)&ifreq.ifr_addr)->sin_addr;

-               if (ioctl(sock, (int)SIOCGIFFLAGS, 
+               if (ioctl(sock, SIOCGIFFLAGS, 

                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get interface flags: %m");
                        continue;
                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get interface flags: %m");
                        continue;


@@ -247,7 +247,7 @@ char **argv;
                        flag = 1;
                else
                        flag = 0;
                        flag = 1;
                else
                        flag = 0;

-               if (ioctl(sock, (int)SIOCGIFNETMASK, 
+               if (ioctl(sock, SIOCGIFNETMASK, 

                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get netmask: %m");
                        continue;
                                        (char *)&ifreq) < 0) {
                        syslog(LOG_ERR, "get netmask: %m");
                        continue;


@@ -255,14 +255,14 @@ char **argv;
                ntp->mask = ((struct sockaddr_in *)
                        &ifreq.ifr_addr)->sin_addr.s_addr;
                if (flag) {
                ntp->mask = ((struct sockaddr_in *)
                        &ifreq.ifr_addr)->sin_addr.s_addr;
                if (flag) {

-                       if (ioctl(sock, (int)SIOCGIFBRDADDR, 
+                       if (ioctl(sock, SIOCGIFBRDADDR, 

                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get broadaddr: %m");
                                continue;
                        }
                        ntp->dest_addr = *(struct sockaddr_in *)&ifreq.ifr_broadaddr;
                } else {
                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get broadaddr: %m");
                                continue;
                        }
                        ntp->dest_addr = *(struct sockaddr_in *)&ifreq.ifr_broadaddr;
                } else {

-                       if (ioctl(sock, (int)SIOCGIFDSTADDR, 
+                       if (ioctl(sock, SIOCGIFDSTADDR, 

                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get destaddr: %m");
                                continue;
                                                (char *)&ifreq) < 0) {
                                syslog(LOG_ERR, "get destaddr: %m");
                                continue;


@@ -325,7 +325,7 @@ char **argv;
          (void) dup2(0, 2);
          s = open("/dev/tty", 2);
          if (s >= 0) {
          (void) dup2(0, 2);
          s = open("/dev/tty", 2);
          if (s >= 0) {

-               (void) ioctl(s, (int)TIOCNOTTY, (char *)0);
+               (void) ioctl(s, TIOCNOTTY, (char *)0);

                (void) close(s);
          }
        }
                (void) close(s);
          }
        }


@@ -508,7 +508,7 @@ setstatus()
        if (trace)
                fprintf(fd, "Net status:\n");
        for (ntp = nettab; ntp != NULL; ntp = ntp->next) {
        if (trace)
                fprintf(fd, "Net status:\n");
        for (ntp = nettab; ntp != NULL; ntp = ntp->next) {

-               switch (ntp->status) {
+               switch ((int)ntp->status) {

                  case MASTER:
                        nmasternets++;
                        break;
                  case MASTER:
                        nmasternets++;
                        break;


@@ -521,7 +521,7 @@ setstatus()
                }
                if (trace) {
                        fprintf(fd, "\t%-16s", inet_ntoa(ntp->net));
                }
                if (trace) {
                        fprintf(fd, "\t%-16s", inet_ntoa(ntp->net));

-                       switch (ntp->status) {
+                       switch ((int)ntp->status) {

                          case MASTER:
                                fprintf(fd, "MASTER\n");
                                break;
                          case MASTER:
                                fprintf(fd, "MASTER\n");
                                break;


@@ -578,7 +578,6 @@ long inf;
 long sup;
 {
        float value;
 long sup;
 {
        float value;

-       long random();

 
        value = (float)(random() & 0x7fffffff) / 0x7fffffff;
        return(inf + (sup - inf) * value);
 
        value = (float)(random() & 0x7fffffff) / 0x7fffffff;
        return(inf + (sup - inf) * value);


@@ -606,6 +605,6 @@ addnetname(name)
                syslog(LOG_ERR, "malloc failed");
                exit(1);
        }
                syslog(LOG_ERR, "malloc failed");
                exit(1);
        }

-       bzero(*netlist, sizeof(**netlist));
+       bzero((char *)*netlist, sizeof(**netlist));

        (*netlist)->name = name;
 }
        (*netlist)->name = name;
 }