X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futil.cpp;h=50423427c1bf0770b83a4c851c073e6dc24bf09d;hb=628df48e0238391658dab54f81dfa1c62dbfb3ec;hp=482003e235230dda5c911c7f3a54838fb1b20c5b;hpb=e86177d7a54d8c2c0e096fd856e64bb9671267a4;p=staging%2Fwindowmanager.git diff --git a/src/util.cpp b/src/util.cpp index 482003e..5042342 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -8,64 +8,6 @@ #include -struct strftime_cache { - time_t time; - char buf[128]; -}; - -static void log_(char const *log_type, FILE *stream, char const *fmt, - va_list args) { - static struct strftime_cache strft; - - time_t t = time(nullptr); - if (t != strft.time) { - strft.time = t; - struct tm tm; - struct tm *tmp = localtime_r(&t, &tm); - strftime(strft.buf, sizeof(strft.buf), "%Y-%m-%dT%H:%M:%S", tmp); - } - - fputs(program_invocation_short_name, stream); - fputs(" ", stream); - fputs(strft.buf, stream); - fputs(" ", stream); - fputs(log_type, stream); - fputs(" ", stream); - vfprintf(stream, fmt, args); - fputs("\n", stream); -} - -void lognotice(char const *fmt, ...) { - va_list a; - va_start(a, fmt); - log_("notice", stdout, fmt, a); - va_end(a); -} - -void logerror(char const *fmt, ...) { - va_list a; - va_start(a, fmt); - log_("error", stderr, fmt, a); - va_end(a); -} - -void fatal(char const *fmt, ...) { - va_list a; - va_start(a, fmt); - log_("fatal", stderr, fmt, a); - va_end(a); - abort(); -} - -#ifdef DEBUG_OUTPUT -void logdebug(char const *fmt, ...) { - va_list a; - va_start(a, fmt); - log_("debug", stdout, fmt, a); - va_end(a); -} -#endif - void Poller::add_fd(int fd, std::function handler) { pfds.emplace_back(pollfd{.fd = fd, .events = POLLIN, .revents = 0}); handlers.emplace_back(std::move(handler));