summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-06 12:14:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:34 -0500
commit481bba9e7f6ebfef11c7c7d778a1b465886abfa9 (patch)
treee0a1d181f366bf5965d9788ecacda1b4d9ada861
parent800212bc12a90a6c32d68c6a01edc3142bd93369 (diff)
downloadsamba-481bba9e7f6ebfef11c7c7d778a1b465886abfa9.tar.gz
samba-481bba9e7f6ebfef11c7c7d778a1b465886abfa9.tar.bz2
samba-481bba9e7f6ebfef11c7c7d778a1b465886abfa9.zip
r3579: with the gcc warning flag from abartlet we don't need sys_strftime()
(This used to be commit 041f77b6a19c98599fe18d2eb4e86db00b40014e)
-rw-r--r--source4/lib/time.c12
-rw-r--r--source4/utils/net/net_time.c2
2 files changed, 2 insertions, 12 deletions
diff --git a/source4/lib/time.c b/source4/lib/time.c
index 9e6da2cfa6..e1f1395fea 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 7668a42b8c..d2df76bc5d 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);