diff options
| author | Rob Landley <rob@landley.net> | 2005-05-04 00:38:15 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2005-05-04 00:38:15 +0000 |
| commit | 8b80c71d70f6f063f01864d2363a235aa1d730cf (patch) | |
| tree | caa49bdf0255fe00bbf30f6f1b69b0054b23522f /networking | |
| parent | 15d3f7f143127fa0a09cc6793ad5fba689cbc1a2 (diff) | |
| download | busybox-8b80c71d70f6f063f01864d2363a235aa1d730cf.tar.gz | |
Patch from Shaun Jackman:
Replace uptime with time(NULL). time is more portable than uptime and
eliminates the need to define uptime, reducing code size slightly.
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/udhcp/arpping.c | 6 | ||||
| -rw-r--r-- | networking/udhcp/common.c | 8 | ||||
| -rw-r--r-- | networking/udhcp/common.h | 1 | ||||
| -rw-r--r-- | networking/udhcp/dhcpc.c | 4 |
4 files changed, 5 insertions, 14 deletions
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index 7cc2be42e..da01ddd71 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c @@ -79,7 +79,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) /* wait arp reply, and check it */ tm.tv_usec = 0; - prevTime = uptime(); + prevTime = time(NULL); while (timeout > 0) { FD_ZERO(&fdset); FD_SET(s, &fdset); @@ -97,8 +97,8 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) break; } } - timeout -= uptime() - prevTime; - prevTime = uptime(); + timeout -= time(NULL) - prevTime; + prevTime = time(NULL); } close(s); DEBUG(LOG_INFO, "%salid arp replies for this address", rv ? "No v" : "V"); diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c index bf2ac4417..6ca7371d5 100644 --- a/networking/udhcp/common.c +++ b/networking/udhcp/common.c @@ -37,14 +37,6 @@ static int daemonized; -long uptime(void) -{ - struct sysinfo info; - sysinfo(&info); - return info.uptime; -} - - /* * This function makes sure our first socket calls * aren't going to fd 1 (printf badness...) and are diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h index ca19a2497..cdc51cf8a 100644 --- a/networking/udhcp/common.h +++ b/networking/udhcp/common.h @@ -39,7 +39,6 @@ enum syslog_levels { #include <syslog.h> #endif -long uptime(void); void background(const char *pidfile); void start_log_and_pid(const char *client_server, const char *pidfile); void background(const char *pidfile); diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 8009bec04..028338ff3 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -310,7 +310,7 @@ int main(int argc, char *argv[]) for (;;) { - tv.tv_sec = timeout - uptime(); + tv.tv_sec = timeout - time(NULL); tv.tv_usec = 0; if (listen_mode != LISTEN_NONE && fd < 0) { @@ -330,7 +330,7 @@ int main(int argc, char *argv[]) retval = select(max_fd + 1, &rfds, NULL, NULL, &tv); } else retval = 0; /* If we already timed out, fall through */ - now = uptime(); + now = time(NULL); if (retval == 0) { /* timeout dropped to zero */ switch (state) { |