log.c (mrouted-4.3) | : | log.c (mrouted-4.4) | ||
---|---|---|---|---|
skipping to change at line 140 | skipping to change at line 140 | |||
msg = (severity == LOG_WARNING) ? fmt : &fmt[10]; | msg = (severity == LOG_WARNING) ? fmt : &fmt[10]; | |||
if (!use_syslog) { | if (!use_syslog) { | |||
if (severity > loglevel) | if (severity > loglevel) | |||
return; | return; | |||
/* Only OK use-case for unsafe gettimeofday(), logging. */ | /* Only OK use-case for unsafe gettimeofday(), logging. */ | |||
gettimeofday(&now, NULL); | gettimeofday(&now, NULL); | |||
now_sec = now.tv_sec; | now_sec = now.tv_sec; | |||
thyme = localtime(&now_sec); | thyme = localtime(&now_sec); | |||
if (!debug) | // if (!debug) | |||
fprintf(stderr, "%s: ", log_name); | fprintf(stderr, "%s: ", log_name); | |||
fprintf(stderr, "%02d:%02d:%02d.%03ld %s", thyme->tm_hour, | fprintf(stderr, "%02d:%02d:%02d.%03ld %s", thyme->tm_hour, | |||
thyme->tm_min, thyme->tm_sec, now.tv_usec / 1000, msg); | thyme->tm_min, thyme->tm_sec, now.tv_usec / 1000, msg); | |||
if (syserr == 0) | if (syserr == 0) | |||
fprintf(stderr, "\n"); | fprintf(stderr, "\n"); | |||
else | else | |||
fprintf(stderr, ": %s\n", strerror(syserr)); | fprintf(stderr, ": %s\n", strerror(syserr)); | |||
goto end; | goto end; | |||
} | } | |||
skipping to change at line 178 | skipping to change at line 178 | |||
} | } | |||
end: | end: | |||
if (severity <= LOG_ERR) | if (severity <= LOG_ERR) | |||
exit(1); | exit(1); | |||
} | } | |||
/** | /** | |||
* Local Variables: | * Local Variables: | |||
* indent-tabs-mode: t | * indent-tabs-mode: t | |||
* c-file-style: "ellemtel" | * c-file-style: "cc-mode" | |||
* c-basic-offset: 4 | ||||
* End: | * End: | |||
*/ | */ | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |