sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

lib: Use timeval_str_buf in timeval_string

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Volker Lendecke 2014-07-29 14:52:42 +00:00 committed by Michael Adam
parent 2aa1492c7b
commit 8799120abd
1 changed files with 17 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/util/time.c
View File

@ -387,46 +387,25 @@ char *timeval_str_buf(const struct timeval *tp, bool hires,
char *timeval_string(TALLOC_CTX *ctx, const struct timeval *tp, bool hires)
{
time_t t;
struct tm *tm;
struct timeval_buf tmp;
char *result;
t = (time_t)tp->tv_sec;
tm = localtime(&t);
if (!tm) {
if (hires) {
return talloc_asprintf(ctx,
"%ld.%06ld seconds since the Epoch",
(long)tp->tv_sec,
(long)tp->tv_usec);
} else {
return talloc_asprintf(ctx,
"%ld seconds since the Epoch",
(long)t);
}
} else {
#ifdef HAVE_STRFTIME
char TimeBuf[60];
if (hires) {
strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %H:%M:%S",tm);
return talloc_asprintf(ctx,
"%s.%06ld", TimeBuf,
(long)tp->tv_usec);
} else {
strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %H:%M:%S",tm);
return talloc_strdup(ctx, TimeBuf);
}
#else
if (hires) {
const char *asct = asctime(tm);
return talloc_asprintf(ctx, "%s.%06ld",
asct ? asct : "unknown",
(long)tp->tv_usec);
} else {
const char *asct = asctime(tm);
return talloc_asprintf(ctx, asct ? asct : "unknown");
}
#endif
result = talloc_strdup(ctx, timeval_str_buf(tp, hires, &tmp));
if (result == NULL) {
return NULL;
}
/*
* beautify the talloc_report output
*
* This is not just cosmetics. A C compiler might in theory make the
* talloc_strdup call above a tail call with the tail call
* optimization. This would render "tmp" invalid while talloc_strdup
* tries to duplicate it. The talloc_set_name_const call below puts
* the talloc_strdup call into non-tail position.
*/
talloc_set_name_const(result, result);
return result;
}
char *current_timestring(TALLOC_CTX *ctx, bool hires)