From cb5568e11bbe2d499d4d43dc30a779a5869b12ea Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Mon, 3 Jul 2017 11:01:28 +0200 Subject: util.h and its impl are now c++ Signed-off-by: Marcus Fritzsch --- src/CMakeLists.txt | 4 ++-- src/main.cpp | 2 +- src/util.c | 65 ------------------------------------------------------ src/util.cpp | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/util.h | 29 ------------------------ src/util.hpp | 29 ++++++++++++++++++++++++ src/wayland.hpp | 2 +- 7 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 src/util.c create mode 100644 src/util.cpp delete mode 100644 src/util.h create mode 100644 src/util.hpp (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fda32c1..2b81367 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,8 +4,8 @@ add_executable(winman main.cpp wayland.cpp wayland.hpp - util.c - util.h + util.cpp + util.hpp ${IVI_CON_PROTO}) target_compile_definitions(winman diff --git a/src/main.cpp b/src/main.cpp index fbd4e46..3b01d95 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,4 @@ -#include "util.h" +#include "util.hpp" #include "wayland.hpp" #include diff --git a/src/util.c b/src/util.c deleted file mode 100644 index af32269..0000000 --- a/src/util.c +++ /dev/null @@ -1,65 +0,0 @@ -#include "util.h" - -#include -#include -#include -#include -#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(NULL); - 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 diff --git a/src/util.cpp b/src/util.cpp new file mode 100644 index 0000000..1d0601a --- /dev/null +++ b/src/util.cpp @@ -0,0 +1,65 @@ +#include "util.hpp" + +#include +#include +#include +#include +#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(NULL); + 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 diff --git a/src/util.h b/src/util.h deleted file mode 100644 index 2fe6e84..0000000 --- a/src/util.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef WM_UTIL_H -#define WM_UTIL_H - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __GNUC__ -#define ATTR_FORMAT(stringindex, firsttocheck) __attribute__((format(printf, stringindex, firsttocheck))) -#else -#define ATTR_FORMAT(stringindex, firsttocheck) -#endif - -void lognotice(char const *fmt, ...) ATTR_FORMAT(1,2); -void logerror(char const *fmt, ...) ATTR_FORMAT(1,2); -void fatal(char const *fmt, ...) ATTR_FORMAT(1,2); - -#ifdef DEBUG_OUTPUT -void logdebug(char const *fmt, ...) ATTR_FORMAT(1,2); -#else -static inline void logdebug(char const * fmt, ...) ATTR_FORMAT(1,2); -static inline void logdebug(char const * fmt, ...) {} -#endif - -#ifdef __cplusplus -} -#endif - -#endif // !WM_UTIL_H diff --git a/src/util.hpp b/src/util.hpp new file mode 100644 index 0000000..2fe6e84 --- /dev/null +++ b/src/util.hpp @@ -0,0 +1,29 @@ +#ifndef WM_UTIL_H +#define WM_UTIL_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef __GNUC__ +#define ATTR_FORMAT(stringindex, firsttocheck) __attribute__((format(printf, stringindex, firsttocheck))) +#else +#define ATTR_FORMAT(stringindex, firsttocheck) +#endif + +void lognotice(char const *fmt, ...) ATTR_FORMAT(1,2); +void logerror(char const *fmt, ...) ATTR_FORMAT(1,2); +void fatal(char const *fmt, ...) ATTR_FORMAT(1,2); + +#ifdef DEBUG_OUTPUT +void logdebug(char const *fmt, ...) ATTR_FORMAT(1,2); +#else +static inline void logdebug(char const * fmt, ...) ATTR_FORMAT(1,2); +static inline void logdebug(char const * fmt, ...) {} +#endif + +#ifdef __cplusplus +} +#endif + +#endif // !WM_UTIL_H diff --git a/src/wayland.hpp b/src/wayland.hpp index 96b0199..b66bca7 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -3,7 +3,7 @@ #include "ivi-controller-client-protocol.h" -#include "util.h" +#include "util.hpp" #include #include -- cgit 1.2.3-korg