Cope with changed signature of http_timestring().

2 files changed, 1 insertions, 559 deletions

diff --git a/source3/lib/events.c b/source3/lib/events.c
index f03138708b..8bbc9497ac 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -436,7 +436,7 @@ void dump_event_list(struct event_context *event_ctx)
 			   te->event_name,
 			   (unsigned long)te,
 			   (int)evt.tv_sec,
-			   http_timestring(te->when.tv_sec)));
+			   http_timestring(talloc_tos(), te->when.tv_sec)));
 	}
 
 	for (fe = event_ctx->fd_events; fe; fe = fe->next) {
diff --git a/source3/lib/time.c b/source3/lib/time.c
index 8cefef6e23..c4aa7d01b3 100644
--- a/source3/lib/time.c
+++ b/source3/lib/time.c
@@ -38,112 +38,12 @@
 
 #define NTTIME_INFINITY (NTTIME)0x8000000000000000LL
 
-/***************************************************************************
- External access to time_t_min and time_t_max.
-****************************************************************************/
-
-time_t get_time_t_max(void)
-{
-	return TIME_T_MAX;
-}
-
-/***************************************************************************
- A gettimeofday wrapper.
-****************************************************************************/
-
-void GetTimeOfDay(struct timeval *tval)
-{
-#ifdef HAVE_GETTIMEOFDAY_TZ
-	gettimeofday(tval,NULL);
-#else
-	gettimeofday(tval);
-#endif
-}
-
 #if (SIZEOF_LONG == 8)
 #define TIME_FIXUP_CONSTANT_INT 11644473600L
 #elif (SIZEOF_LONG_LONG == 8)
 #define TIME_FIXUP_CONSTANT_INT 11644473600LL
 #endif
 
-/****************************************************************************
- Interpret an 8 byte "filetime" structure to a time_t
- It's originally in "100ns units since jan 1st 1601"
-
- An 8 byte value of 0xffffffffffffffff will be returned as a timespec of
-
-	tv_sec = 0
-	tv_nsec = 0;
-
- Returns GMT.
-****************************************************************************/
-
-time_t nt_time_to_unix(NTTIME nt)
-{
-	return convert_timespec_to_time_t(nt_time_to_unix_timespec(&nt));
-}
-
-/****************************************************************************
- Put a 8 byte filetime from a time_t. Uses GMT.
-****************************************************************************/
-
-void unix_to_nt_time(NTTIME *nt, time_t t)
-{
-	uint64_t t2; 
-
-	if (t == (time_t)-1) {
-		*nt = (NTTIME)-1LL;
-		return;
-	}	
-
-	if (t == TIME_T_MAX) {
-		*nt = 0x7fffffffffffffffLL;
-		return;
-	}
-
-	if (t == 0) {
-		*nt = 0;
-		return;
-	}		
-
-	t2 = t;
-	t2 += TIME_FIXUP_CONSTANT_INT;
-	t2 *= 1000*1000*10;
-
-	*nt = t2;
-}
-
-/****************************************************************************
- Check if it's a null unix time.
-****************************************************************************/
-
-bool null_time(time_t t)
-{
-	return t == 0 || 
-		t == (time_t)0xFFFFFFFF || 
-		t == (time_t)-1;
-}
-
-/****************************************************************************
- Check if it's a null NTTIME.
-****************************************************************************/
-
-bool null_nttime(NTTIME t)
-{
-	return t == 0 || t == (NTTIME)-1;
-}
-
-/****************************************************************************
- Check if it's a null timespec.
-****************************************************************************/
-
-bool null_timespec(struct timespec ts)
-{
-	return ts.tv_sec == 0 || 
-		ts.tv_sec == (time_t)0xFFFFFFFF || 
-		ts.tv_sec == (time_t)-1;
-}
-
 /*******************************************************************
   create a 16 bit dos packed date
 ********************************************************************/
@@ -193,183 +93,6 @@ static uint32_t make_dos_date(time_t unixdate, int zone_offset)
 }
 
 /**
-put a dos date into a buffer (time/date format)
-This takes GMT time and puts local time in the buffer
-**/
-void push_dos_date(uint8_t *buf, int offset, time_t unixdate, int zone_offset)
-{
-	uint32_t x = make_dos_date(unixdate, zone_offset);
-	SIVAL(buf,offset,x);
-}
-
-/**
-put a dos date into a buffer (date/time format)
-This takes GMT time and puts local time in the buffer
-**/
-void push_dos_date2(uint8_t *buf,int offset,time_t unixdate, int zone_offset)
-{
-	uint32_t x;
-	x = make_dos_date(unixdate, zone_offset);
-	x = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16);
-	SIVAL(buf,offset,x);
-}
-
-/**
-put a dos 32 bit "unix like" date into a buffer. This routine takes
-GMT and converts it to LOCAL time before putting it (most SMBs assume
-localtime for this sort of date)
-**/
-void push_dos_date3(uint8_t *buf,int offset,time_t unixdate, int zone_offset)
-{
-	if (!null_time(unixdate)) {
-		unixdate -= zone_offset;
-	}
-	SIVAL(buf,offset,unixdate);
-}
-
-/*******************************************************************
-  interpret a 32 bit dos packed date/time to some parameters
-********************************************************************/
-static void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *hour,int *minute,int *second)
-{
-	uint32_t p0,p1,p2,p3;
-
-	p0=date&0xFF; p1=((date&0xFF00)>>8)&0xFF; 
-	p2=((date&0xFF0000)>>16)&0xFF; p3=((date&0xFF000000)>>24)&0xFF;
-
-	*second = 2*(p0 & 0x1F);
-	*minute = ((p0>>5)&0xFF) + ((p1&0x7)<<3);
-	*hour = (p1>>3)&0xFF;
-	*day = (p2&0x1F);
-	*month = ((p2>>5)&0xFF) + ((p3&0x1)<<3) - 1;
-	*year = ((p3>>1)&0xFF) + 80;
-}
-
-/**
-  create a unix date (int GMT) from a dos date (which is actually in
-  localtime)
-**/
-time_t pull_dos_date(const uint8_t *date_ptr, int zone_offset)
-{
-	uint32_t dos_date=0;
-	struct tm t;
-	time_t ret;
-
-	dos_date = IVAL(date_ptr,0);
-
-	if (dos_date == 0) return (time_t)0;
-  
-	interpret_dos_date(dos_date,&t.tm_year,&t.tm_mon,
-			   &t.tm_mday,&t.tm_hour,&t.tm_min,&t.tm_sec);
-	t.tm_isdst = -1;
-  
-	ret = timegm(&t);
-
-	ret += zone_offset;
-
-	return ret;
-}
-
-/**
-like make_unix_date() but the words are reversed
-**/
-time_t pull_dos_date2(const uint8_t *date_ptr, int zone_offset)
-{
-	uint32_t x,x2;
-
-	x = IVAL(date_ptr,0);
-	x2 = ((x&0xFFFF)<<16) | ((x&0xFFFF0000)>>16);
-	SIVAL(&x,0,x2);
-
-	return pull_dos_date((const uint8_t *)&x, zone_offset);
-}
-
-/**
-  create a unix GMT date from a dos date in 32 bit "unix like" format
-  these generally arrive as localtimes, with corresponding DST
-**/
-time_t pull_dos_date3(const uint8_t *date_ptr, int zone_offset)
-{
-	time_t t = (time_t)IVAL(date_ptr,0);
-	if (!null_time(t)) {
-		t += zone_offset;
-	}
-	return t;
-}
-
-/***************************************************************************
- Return a HTTP/1.0 time string.
-***************************************************************************/
-
-char *http_timestring(time_t t)
-{
-	fstring buf;
-	struct tm *tm = localtime(&t);
-
-	if (t == TIME_T_MAX) {
-		fstrcpy(buf, "never");
-	} else if (!tm) {
-		fstr_sprintf(buf, "%ld seconds since the Epoch", (long)t);
-	} else {
-#ifndef HAVE_STRFTIME
-		const char *asct = asctime(tm);
-		fstrcpy(buf, asct ? asct : "unknown");
-	}
-	if(buf[strlen(buf)-1] == '\n') {
-		buf[strlen(buf)-1] = 0;
-#else /* !HAVE_STRFTIME */
-		strftime(buf, sizeof(buf)-1, "%a, %d %b %Y %H:%M:%S %Z", tm);
-#endif /* !HAVE_STRFTIME */
-	}
-	return talloc_strdup(talloc_tos(), buf);
-}
-
-
-/**
- Return the date and time as a string
-**/
-char *timestring(TALLOC_CTX *mem_ctx, time_t t)
-{
-	char *TimeBuf;
-	char tempTime[80];
-	struct tm *tm;
-
-	tm = localtime(&t);
-	if (!tm) {
-		return talloc_asprintf(mem_ctx,
-				       "%ld seconds since the Epoch",
-				       (long)t);
-	}
-
-#ifdef HAVE_STRFTIME
-	/* some versions of gcc complain about using %c. This is a bug
-	   in the gcc warning, not a bug in this code. See a recent
-	   strftime() manual page for details.
-	 */
-	strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
-	TimeBuf = talloc_strdup(mem_ctx, tempTime);
-#else
-	TimeBuf = talloc_strdup(mem_ctx, asctime(tm));
-#endif
-
-	return TimeBuf;
-}
-
-/**
-  return a talloced string representing a NTTIME for human consumption
-*/
-const char *nt_time_string(TALLOC_CTX *mem_ctx, NTTIME nt)
-{
-	time_t t;
-	if (nt == 0) {
-		return "NTTIME(0)";
-	}
-	t = nt_time_to_unix(nt);
-	return timestring(mem_ctx, t);
-}
-
-
-/**
   parse a nttime as a large integer in a string and return a NTTIME
 */
 NTTIME nttime_from_string(const char *s)
@@ -377,190 +100,6 @@ NTTIME nttime_from_string(const char *s)
 	return strtoull(s, NULL, 0);
 }
 
-/**
-  return (tv1 - tv2) in microseconds
-*/
-int64_t usec_time_diff(struct timeval *tv1, struct timeval *tv2)
-{
-	int64_t sec_diff = tv1->tv_sec - tv2->tv_sec;
-	return (sec_diff * 1000000) + (int64_t)(tv1->tv_usec - tv2->tv_usec);
-}
-
-
-/**
-  return a zero timeval
-*/
-struct timeval timeval_zero(void)
-{
-	struct timeval tv;
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-	return tv;
-}
-
-/**
-  return True if a timeval is zero
-*/
-bool timeval_is_zero(const struct timeval *tv)
-{
-	return tv->tv_sec == 0 && tv->tv_usec == 0;
-}
-
-/**
-  return a timeval for the current time
-*/
-struct timeval timeval_current(void)
-{
-	struct timeval tv;
-	GetTimeOfDay(&tv);
-	return tv;
-}
-
-/**
-  return a timeval struct with the given elements
-*/
-struct timeval timeval_set(uint32_t secs, uint32_t usecs)
-{
-	struct timeval tv;
-	tv.tv_sec = secs;
-	tv.tv_usec = usecs;
-	return tv;
-}
-
-
-/**
-  return a timeval ofs microseconds after tv
-*/
-struct timeval timeval_add(const struct timeval *tv,
-			   uint32_t secs, uint32_t usecs)
-{
-	struct timeval tv2 = *tv;
-	const unsigned int million = 1000000;
-	tv2.tv_sec += secs;
-	tv2.tv_usec += usecs;
-	tv2.tv_sec += tv2.tv_usec / million;
-	tv2.tv_usec = tv2.tv_usec % million;
-	return tv2;
-}
-
-/**
-  return the sum of two timeval structures
-*/
-struct timeval timeval_sum(const struct timeval *tv1,
-			   const struct timeval *tv2)
-{
-	return timeval_add(tv1, tv2->tv_sec, tv2->tv_usec);
-}
-
-/**
-  return a timeval secs/usecs into the future
-*/
-struct timeval timeval_current_ofs(uint32_t secs, uint32_t usecs)
-{
-	struct timeval tv = timeval_current();
-	return timeval_add(&tv, secs, usecs);
-}
-
-/**
-  compare two timeval structures. 
-  Return -1 if tv1 < tv2
-  Return 0 if tv1 == tv2
-  Return 1 if tv1 > tv2
-*/
-int timeval_compare(const struct timeval *tv1, const struct timeval *tv2)
-{
-	if (tv1->tv_sec  > tv2->tv_sec)  return 1;
-	if (tv1->tv_sec  < tv2->tv_sec)  return -1;
-	if (tv1->tv_usec > tv2->tv_usec) return 1;
-	if (tv1->tv_usec < tv2->tv_usec) return -1;
-	return 0;
-}
-
-/**
-  return True if a timer is in the past
-*/
-bool timeval_expired(const struct timeval *tv)
-{
-	struct timeval tv2 = timeval_current();
-	if (tv2.tv_sec > tv->tv_sec) return True;
-	if (tv2.tv_sec < tv->tv_sec) return False;
-	return (tv2.tv_usec >= tv->tv_usec);
-}
-
-/**
-  return the number of seconds elapsed between two times
-*/
-double timeval_elapsed2(const struct timeval *tv1, const struct timeval *tv2)
-{
-	return (tv2->tv_sec - tv1->tv_sec) + 
-	       (tv2->tv_usec - tv1->tv_usec)*1.0e-6;
-}
-
-/**
-  return the number of seconds elapsed since a given time
-*/
-double timeval_elapsed(const struct timeval *tv)
-{
-	struct timeval tv2 = timeval_current();
-	return timeval_elapsed2(tv, &tv2);
-}
-
-/**
-  return the lesser of two timevals
-*/
-struct timeval timeval_min(const struct timeval *tv1,
-			   const struct timeval *tv2)
-{
-	if (tv1->tv_sec < tv2->tv_sec) return *tv1;
-	if (tv1->tv_sec > tv2->tv_sec) return *tv2;
-	if (tv1->tv_usec < tv2->tv_usec) return *tv1;
-	return *tv2;
-}
-
-/**
-  return the greater of two timevals
-*/
-struct timeval timeval_max(const struct timeval *tv1,
-			   const struct timeval *tv2)
-{
-	if (tv1->tv_sec > tv2->tv_sec) return *tv1;
-	if (tv1->tv_sec < tv2->tv_sec) return *tv2;
-	if (tv1->tv_usec > tv2->tv_usec) return *tv1;
-	return *tv2;
-}
-
-/**
-  return the difference between two timevals as a timeval
-  if tv1 comes after tv2, then return a zero timeval
-  (this is *tv2 - *tv1)
-*/
-struct timeval timeval_until(const struct timeval *tv1,
-			     const struct timeval *tv2)
-{
-	struct timeval t;
-	if (timeval_compare(tv1, tv2) >= 0) {
-		return timeval_zero();
-	}
-	t.tv_sec = tv2->tv_sec - tv1->tv_sec;
-	if (tv1->tv_usec > tv2->tv_usec) {
-		t.tv_sec--;
-		t.tv_usec = 1000000 - (tv1->tv_usec - tv2->tv_usec);
-	} else {
-		t.tv_usec = tv2->tv_usec - tv1->tv_usec;
-	}
-	return t;
-}
-
-
-/**
-  convert a timeval to a NTTIME
-*/
-NTTIME timeval_to_nttime(const struct timeval *tv)
-{
-	return 10*(tv->tv_usec + 
-		  ((TIME_FIXUP_CONSTANT_INT + (uint64_t)tv->tv_sec) * 1000000));
-}
-
 /**************************************************************
  Handle conversions between time_t and uint32, taking care to
  preserve the "special" values.
@@ -592,44 +131,8 @@ time_t convert_uint32_to_time_t(uint32 u)
 	return (time_t)u;
 }
 
-/*******************************************************************
- Yield the difference between *A and *B, in seconds, ignoring leap seconds.
-********************************************************************/
-
-static int tm_diff(struct tm *a, struct tm *b)
-{
-	int ay = a->tm_year + (1900 - 1);
-	int by = b->tm_year + (1900 - 1);
-	int intervening_leap_days =
-		(ay/4 - by/4) - (ay/100 - by/100) + (ay/400 - by/400);
-	int years = ay - by;
-	int days = 365*years + intervening_leap_days + (a->tm_yday - b->tm_yday);
-	int hours = 24*days + (a->tm_hour - b->tm_hour);
-	int minutes = 60*hours + (a->tm_min - b->tm_min);
-	int seconds = 60*minutes + (a->tm_sec - b->tm_sec);
-
-	return seconds;
-}
-
 int extra_time_offset=0;
 
-/*******************************************************************
- Return the UTC offset in seconds west of UTC, or 0 if it cannot be determined.
-********************************************************************/
-
-int get_time_zone(time_t t)
-{
-	struct tm *tm = gmtime(&t);
-	struct tm tm_utc;
-	if (!tm)
-		return 0;
-	tm_utc = *tm;
-	tm = localtime(&t);
-	if (!tm)
-		return 0;
-	return tm_diff(&tm_utc,tm)+60*extra_time_offset;
-}
-
 /****************************************************************************
  Check if NTTIME is 0.
 ****************************************************************************/
@@ -1084,24 +587,6 @@ time_t srv_make_unix_date3(const void *date_ptr)
 	return make_unix_date3(date_ptr, server_zone_offset);
 }
 
-time_t convert_timespec_to_time_t(struct timespec ts)
-{
-	/* 1 ns == 1,000,000,000 - one thousand millionths of a second.
-	   increment if it's greater than 500 millionth of a second. */
-	if (ts.tv_nsec > 500000000) {
-		return ts.tv_sec + 1;
-	}
-	return ts.tv_sec;
-}
-
-struct timespec convert_time_t_to_timespec(time_t t)
-{
-	struct timespec ts;
-	ts.tv_sec = t;
-	ts.tv_nsec = 0;
-	return ts;
-}
-
 /****************************************************************************
  Convert a normalized timeval to a timespec.
 ****************************************************************************/
@@ -1222,49 +707,6 @@ time_t cli_make_unix_date3(struct cli_state *cli, const void *date_ptr)
 	return make_unix_date3(date_ptr, cli->serverzone);
 }
 
-/* Large integer version. */
-struct timespec nt_time_to_unix_timespec(NTTIME *nt)
-{
-	int64 d;
-	struct timespec ret;
-
-	if (*nt == 0 || *nt == (int64)-1) {
-		ret.tv_sec = 0;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
-	d = (int64)*nt;
-	/* d is now in 100ns units, since jan 1st 1601".
-	   Save off the ns fraction. */
-
-	/*
-	 * Take the last seven decimal digits and multiply by 100.
-	 * to convert from 100ns units to 1ns units.
-	 */
-        ret.tv_nsec = (long) ((d % (1000 * 1000 * 10)) * 100);
-
-	/* Convert to seconds */
-	d /= 1000*1000*10;
-
-	/* Now adjust by 369 years to make the secs since 1970 */
-	d -= TIME_FIXUP_CONSTANT_INT;
-
-	if (d <= (int64)TIME_T_MIN) {
-		ret.tv_sec = TIME_T_MIN;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
-	if (d >= (int64)TIME_T_MAX) {
-		ret.tv_sec = TIME_T_MAX;
-		ret.tv_nsec = 0;
-		return ret;
-	}
-
-	ret.tv_sec = (time_t)d;
-	return ret;
-}
 /****************************************************************************
  Check if two NTTIMEs are the same.
 ****************************************************************************/