uptime should return time_t

diff --git a/common.c b/common.c
index e07b26f05055c0f8554303c209f7d1518e8020fd..747e4f0e04f45913126667856141a126201acd92 100644 (file)
--- a/common.c
+++ b/common.c
@@ -167,7 +167,7 @@ int get_time (struct timeval *tp)
 #endif
 }
 
-long uptime (void)
+time_t uptime (void)
 {
        struct timeval tp;
 

diff --git a/common.h b/common.h
index ff97e035f18f3acb6673e4de31a37aa764deb977..3dbae4b8f32bdfab4b3e83d4b3143f54acc54b34 100644 (file)
--- a/common.h
+++ b/common.h
@@ -51,7 +51,7 @@ void srandomdev (void);
 void close_fds (void);
 char *getline (FILE *fp);
 int get_time (struct timeval *tp);
-long uptime (void);
+time_t uptime (void);
 void writepid (int fd, pid_t pid);
 void *xrealloc (void *ptr, size_t size);
 void *xmalloc (size_t size);

diff --git a/dhcp.h b/dhcp.h
index fc75fd4cef4433fd6092774d69c03d06fbe9026d..48dc7cc920dc538becc218046c025a4ac0b6a063 100644 (file)
--- a/dhcp.h
+++ b/dhcp.h
@@ -167,8 +167,6 @@ typedef struct dhcp_t
        bool frominfo;
 } dhcp_t;
 
-
-
 /* Sizes for DHCP options */
 #define DHCP_CHADDR_LEN         16
 #define SERVERNAME_LEN          64