Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

libspl: zed: event: use localtime_r() 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13284
This commit is contained in:
наб 2022-04-04 14:07:26 +02:00 committed by Brian Behlendorf
parent ae3683ce11
commit 9185303b32
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/zed/zed_event.c
View File

@ -884,21 +884,21 @@ _zed_event_get_subclass(const char *class)
static void static void
_zed_event_add_time_strings(uint64_t eid, zed_strings_t *zsp, int64_t etime[]) _zed_event_add_time_strings(uint64_t eid, zed_strings_t *zsp, int64_t etime[])
{ {
struct tm *stp; struct tm stp;
char buf[32]; char buf[32];
assert(zsp != NULL); assert(zsp != NULL);
assert(etime != NULL); assert(etime != NULL);
_zed_event_add_var(eid, zsp, ZEVENT_VAR_PREFIX, "TIME_SECS", _zed_event_add_var(eid, zsp, ZEVENT_VAR_PREFIX, "TIME_SECS",
"%lld", (long long int) etime[0]); "%" PRId64, etime[0]);
_zed_event_add_var(eid, zsp, ZEVENT_VAR_PREFIX, "TIME_NSECS", _zed_event_add_var(eid, zsp, ZEVENT_VAR_PREFIX, "TIME_NSECS",
"%lld", (long long int) etime[1]); "%" PRId64, etime[1]);
if (!(stp = localtime((const time_t *) &etime[0]))) { if (!localtime_r((const time_t *) &etime[0], &stp)) {
zed_log_msg(LOG_WARNING, "Failed to add %s%s for eid=%llu: %s", zed_log_msg(LOG_WARNING, "Failed to add %s%s for eid=%llu: %s",
ZEVENT_VAR_PREFIX, "TIME_STRING", eid, "localtime error"); ZEVENT_VAR_PREFIX, "TIME_STRING", eid, "localtime error");
} else if (!strftime(buf, sizeof (buf), "%Y-%m-%d %H:%M:%S%z", stp)) { } else if (!strftime(buf, sizeof (buf), "%Y-%m-%d %H:%M:%S%z", &stp)) {
zed_log_msg(LOG_WARNING, "Failed to add %s%s for eid=%llu: %s", zed_log_msg(LOG_WARNING, "Failed to add %s%s for eid=%llu: %s",
ZEVENT_VAR_PREFIX, "TIME_STRING", eid, "strftime error"); ZEVENT_VAR_PREFIX, "TIME_STRING", eid, "strftime error");
} else { } else {