From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 6 Nov 2004 12:14:14 +0000 (+0000)
Subject: r3579: with the gcc warning flag from abartlet we don't need sys_strftime()
X-Git-Tag: samba-4.0.0alpha6~801^3~12683
X-Git-Url: http://git.samba.org/samba.git/?p=bbaumbach%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=481bba9e7f6ebfef11c7c7d778a1b465886abfa9;ds=inline

r3579: with the gcc warning flag from abartlet we don't need sys_strftime()
(This used to be commit 041f77b6a19c98599fe18d2eb4e86db00b40014e)
---

diff --git a/source4/lib/time.c b/source4/lib/time.c
index 9e6da2cfa69..e1f1395fea3 100644
--- a/source4/lib/time.c
+++ b/source4/lib/time.c
@@ -311,16 +311,6 @@ char *ldap_timestring(TALLOC_CTX *mem_ctx, time_t t)
 			       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 @@ char *timestring(TALLOC_CTX *mem_ctx, time_t t)
 	   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));
diff --git a/source4/utils/net/net_time.c b/source4/utils/net/net_time.c
index 7668a42b8ca..d2df76bc5d0 100644
--- a/source4/utils/net/net_time.c
+++ b/source4/utils/net/net_time.c
@@ -66,7 +66,7 @@ int net_time(struct net_context *ctx, int argc, const char **argv)
 
 	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);