Kill usage of timeb.h for upcoming removal of libcompat. OK deraadt@

7 files changed, 7 insertions, 8 deletions

diff --git a/gnu/usr.bin/cvs/src/client.c b/gnu/usr.bin/cvs/src/client.c
index 0c0df1bc91d..f7abc83391f 100644
--- a/gnu/usr.bin/cvs/src/client.c
+++ b/gnu/usr.bin/cvs/src/client.c
@@ -1578,7 +1578,7 @@ handle_mod_time (args, len)
 {
     if (stored_modtime_valid)
 	error (0, 0, "protocol error: duplicate Mod-time");
-    stored_modtime = get_date (args, NULL);
+    stored_modtime = get_date (args);
     if (stored_modtime == (time_t) -1)
 	error (0, 0, "protocol error: cannot parse date %s", args);
     else
diff --git a/gnu/usr.bin/cvs/src/cvs.h b/gnu/usr.bin/cvs/src/cvs.h
index 30ed9da4068..8755f570db7 100644
--- a/gnu/usr.bin/cvs/src/cvs.h
+++ b/gnu/usr.bin/cvs/src/cvs.h
@@ -518,7 +518,7 @@ int update PROTO((int argc, char *argv[]));
 int xcmp PROTO((const char *file1, const char *file2));
 int yesno PROTO((void));
 void *valloc PROTO((size_t bytes));
-time_t get_date PROTO((char *date, struct timeb *now));
+time_t get_date PROTO((char *date));
 extern int Create_Admin PROTO ((char *dir, char *update_dir,
 				char *repository, char *tag, char *date,
 				int nonbranch, int warn, int dotemplate));
diff --git a/gnu/usr.bin/cvs/src/history.c b/gnu/usr.bin/cvs/src/history.c
index 945b1e116a9..106e987b2a2 100644
--- a/gnu/usr.bin/cvs/src/history.c
+++ b/gnu/usr.bin/cvs/src/history.c
@@ -508,7 +508,7 @@ history (argc, argv)
 		    char *buf = xmalloc (sizeof (f) - 2 + strlen (optarg));
 		    time_t t;
 		    sprintf (buf, f, optarg);
-		    t = get_date (buf, (struct timeb *) NULL);
+		    t = get_date (buf);
 		    free (buf);
 		    if (t == (time_t) -1)
 			error (0, 0, "%s is not a known time zone", optarg);
diff --git a/gnu/usr.bin/cvs/src/main.c b/gnu/usr.bin/cvs/src/main.c
index 9c1f514afb0..aff26d56eb3 100644
--- a/gnu/usr.bin/cvs/src/main.c
+++ b/gnu/usr.bin/cvs/src/main.c
@@ -1078,7 +1078,7 @@ Make_Date (rawdate)
 {
     time_t unixtime;
 
-    unixtime = get_date (rawdate, (struct timeb *) NULL);
+    unixtime = get_date (rawdate);
     if (unixtime == (time_t) - 1)
 	error (1, 0, "Can't parse date/time: %s", rawdate);
     return date_from_time_t (unixtime);
diff --git a/gnu/usr.bin/cvs/src/rcs.c b/gnu/usr.bin/cvs/src/rcs.c
index a21aba51234..5684a7e3dbf 100644
--- a/gnu/usr.bin/cvs/src/rcs.c
+++ b/gnu/usr.bin/cvs/src/rcs.c
@@ -3057,7 +3057,7 @@ RCS_getrevtime (rcs, rev, date, fudge)
 		    ftm->tm_min, ftm->tm_sec);
 
     /* turn it into seconds since the epoch */
-    revdate = get_date (tdate, (struct timeb *) NULL);
+    revdate = get_date (tdate);
     if (revdate != (time_t) -1)
     {
 	revdate -= fudge;		/* remove "fudge" seconds */
diff --git a/gnu/usr.bin/cvs/src/server.c b/gnu/usr.bin/cvs/src/server.c
index 8d7114256b8..91afd17918d 100644
--- a/gnu/usr.bin/cvs/src/server.c
+++ b/gnu/usr.bin/cvs/src/server.c
@@ -1919,7 +1919,7 @@ serve_checkin_time (arg)
 	return;
     }
 
-    checkin_time = get_date (arg, NULL);
+    checkin_time = get_date (arg);
     if (checkin_time == (time_t)-1)
     {
 	if (alloc_pending (80 + strlen (arg)))
diff --git a/gnu/usr.bin/cvs/src/subr.c b/gnu/usr.bin/cvs/src/subr.c
index 597b2f137f6..b9b8227ceda 100644
--- a/gnu/usr.bin/cvs/src/subr.c
+++ b/gnu/usr.bin/cvs/src/subr.c
@@ -382,9 +382,8 @@ getcaller ()
 #ifndef __GNUC__
 /* ARGSUSED */
 time_t
-get_date (date, now)
+get_date (date)
     char *date;
-    struct timeb *now;
 {
     time_t foo = 0;