svn commit: samba r3579 - in branches/SAMBA_4_0/source: lib utils/net

[tridge at samba.org]

Author: tridge
Date: 2004-11-06 12:14:14 +0000 (Sat, 06 Nov 2004)
New Revision: 3579

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3579

Log:
with the gcc warning flag from abartlet we don't need sys_strftime()


Modified:
   branches/SAMBA_4_0/source/lib/time.c
   branches/SAMBA_4_0/source/utils/net/net_time.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/time.c
===================================================================
--- branches/SAMBA_4_0/source/lib/time.c	2004-11-06 12:10:57 UTC (rev 3578)
+++ branches/SAMBA_4_0/source/lib/time.c	2004-11-06 12:14:14 UTC (rev 3579)
@@ -311,16 +311,6 @@
 			       tm->tm_sec);
 }
 
-/*
-  a hack to move the stupid gcc strftime warning to one place - see manual page
-*/
-#ifdef HAVE_STRFTIME
-size_t sys_strftime(char *s, size_t max, const char *fmt, const struct tm *tm) 
-{
-	return strftime(s, max, fmt, tm);
-}
-#endif
-
 /****************************************************************************
  Return the date and time as a string
 ****************************************************************************/
@@ -342,7 +332,7 @@
 	   in the gcc warning, not a bug in this code. See a recent
 	   strftime() manual page for details.
 	 */
-	sys_strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
+	strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
 	TimeBuf = talloc_strdup(mem_ctx, tempTime);
 #else
 	TimeBuf = talloc_strdup(mem_ctx, asctime(tm));

Modified: branches/SAMBA_4_0/source/utils/net/net_time.c
===================================================================
--- branches/SAMBA_4_0/source/utils/net/net_time.c	2004-11-06 12:10:57 UTC (rev 3578)
+++ branches/SAMBA_4_0/source/utils/net/net_time.c	2004-11-06 12:14:14 UTC (rev 3579)
@@ -66,7 +66,7 @@
 
 	ZERO_ARRAY(timestr);
 	tm = localtime(&r.generic.out.time);
-	sys_strftime(timestr, sizeof(timestr)-1, "%c %Z",tm);
+	strftime(timestr, sizeof(timestr)-1, "%c %Z",tm);
 
 	printf("%s\n",timestr);