X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Ferror.c;h=a7d6e1220a88be351397ce65bc919f16f2266234;hb=2a85be8e0e679da996b48252b1d9aebb9bb29126;hp=236f21baee25fea33a1d9b4b35ba76796bbf3832;hpb=b178f53e90c376dd44b020535c32649edef8f80e;p=lttng-tools.git 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 ""; }