diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-03-21 07:34:27 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-03-21 07:34:27 +0000 |
| commit | 1ca20a77476fb69e2472080ef6ba23c8c0ad12ad (patch) | |
| tree | d1f07be4de0004fe5e30b44320e10285147e7944 /util-linux/rdate.c | |
| parent | 7447642a47c6a0aefd05f4acf730950a510634cd (diff) | |
| download | busybox-1ca20a77476fb69e2472080ef6ba23c8c0ad12ad.tar.gz | |
A nice patch from Larry Doolittle that adds -Wshadow and
cleans up most of the now-revealed problems.
Diffstat (limited to 'util-linux/rdate.c')
| -rw-r--r-- | util-linux/rdate.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/util-linux/rdate.c b/util-linux/rdate.c index 5f31282fc..ead1e7c7d 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c @@ -40,7 +40,7 @@ static const int RFC_868_BIAS = 2208988800UL; static time_t askremotedate(const char *host) { struct hostent *h; - struct sockaddr_in sin; + struct sockaddr_in s_in; struct servent *tserv; unsigned long int nett, localt; int fd; @@ -54,11 +54,11 @@ static time_t askremotedate(const char *host) if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) /* get net connection */ perror_msg_and_die("%s", "socket"); - memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr)); - sin.sin_port= tserv->s_port; - sin.sin_family = AF_INET; + memcpy(&s_in.sin_addr, h->h_addr, sizeof(s_in.sin_addr)); + s_in.sin_port= tserv->s_port; + s_in.sin_family = AF_INET; - if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) /* connect to time server */ + if (connect(fd, (struct sockaddr *)&s_in, sizeof(s_in)) < 0) /* connect to time server */ perror_msg_and_die("%s", host); if (read(fd, (void *)&nett, 4) != 4) /* read time from server */ @@ -79,7 +79,7 @@ static time_t askremotedate(const char *host) int rdate_main(int argc, char **argv) { - time_t time; + time_t remote_time; int opt; int setdate = 0; int printdate= 0; @@ -111,15 +111,15 @@ int rdate_main(int argc, char **argv) if (optind == argc) show_usage(); - time = askremotedate(argv[optind]); + remote_time = askremotedate(argv[optind]); if (setdate) { - if (stime(&time) < 0) + if (stime(&remote_time) < 0) perror_msg_and_die("Could not set time of day"); } if (printdate) - printf("%s", ctime(&time)); + printf("%s", ctime(&remote_time)); return EXIT_SUCCESS; } |