X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ferror.c;fp=src%2Fcommon%2Ferror.c;h=a7d6e1220a88be351397ce65bc919f16f2266234;hp=236f21baee25fea33a1d9b4b35ba76796bbf3832;hb=b1093e5fa7d006fb463b2754119c6d2796bb7d82;hpb=2f9c3030a1c6ba4c1e703a6fbb6d1ef3dd2da8b5 diff --git a/src/common/error.c b/src/common/error.c index 236f21bae..a7d6e1220 100644 --- a/src/common/error.c +++ b/src/common/error.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -45,6 +46,7 @@ const char *log_add_time(void) struct tm tm, *res; struct timespec tp; time_t now; + const int errsv = errno; ret = lttng_clock_gettime(CLOCK_REALTIME, &tp); if (ret < 0) { @@ -65,10 +67,12 @@ const char *log_add_time(void) goto error; } + errno = errsv; return URCU_TLS(error_log_time).str; error: /* Return an empty string on error so logging is not affected. */ + errno = errsv; return ""; }