From 964da05ef27ed14a2494e4eb438c8f7baa3b5d07 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Mon, 31 Jan 2022 08:15:08 -0800
Subject: [PATCH] Revert "accommodate gcc vs. msvc handling of empty
 __VA_ARGS__"

This reverts commit f7dd311daacb90a55a1996bd734b917fea7d80f1.
---
 ioc/iochooks.cpp   |  2 +-
 src/pvxs/log.h     | 41 ++++++-----------------------------------
 src/serverconn.cpp |  2 +-
 3 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/ioc/iochooks.cpp b/ioc/iochooks.cpp
index ef2f4a9..3071530 100644
--- a/ioc/iochooks.cpp
+++ b/ioc/iochooks.cpp
@@ -177,7 +177,7 @@ void pvxsAtExit(void* unused)
                 // take ownership
                 std::unique_ptr<server::Server> trash(serv);
                 trash->stop();
-                log_debug_printf(log, "Stopped Server?\n");
+                log_debug_printf(log, "Stopped Server?%s", "\n");
             }
         }
     } catch(std::exception& e) {
diff --git a/src/pvxs/log.h b/src/pvxs/log.h
index 41e8f60..a1c5afc 100644
--- a/src/pvxs/log.h
+++ b/src/pvxs/log.h
@@ -65,8 +65,7 @@ void _log_printf(unsigned lvl, const char* fmt, ...) EPICS_PRINTF_STYLE(2,3);
 PVXS_API
 void xerrlogHexPrintf(const void *buf, size_t buflen);
 
-/** @macro log_printf
- *  Try to log a message at the defined level.
+/** Try to log a message at the defined level.
  *
  * Due to portability issues with MSVC, log formats must have at least one argument.
  *
@@ -76,17 +75,16 @@ void xerrlogHexPrintf(const void *buf, size_t buflen);
  *          log_info_printf(blah, "blah happened with %d\n", x);
  *  @endcode
  */
-
-#if defined(_MSC_VER) && (!defined(_MSVC_TRADITIONAL) || _MSVC_TRADITIONAL==1)
-// MSVC when _MSVC_TRADITIONAL undefined (prior to vs2017)
-// or later when using legacy pre-processor.
-// empty __VA_ARGS__ swallows a leading comma
-
 #define log_printf(LOGGER, LVL, FMT, ...) do{ \
     if((LOGGER).test(LVL)) \
        ::pvxs::detail:: _log_printf(unsigned(LVL), "%s " FMT, ::pvxs::detail::log_prefix((LOGGER).name, LVL), __VA_ARGS__); \
 }while(0)
 
+#define log_crit_printf(LOGGER, FMT, ...)  log_printf(LOGGER, ::pvxs::Level::Crit, FMT, __VA_ARGS__)
+#define log_err_printf(LOGGER, FMT, ...)   log_printf(LOGGER, ::pvxs::Level::Err, FMT, __VA_ARGS__)
+#define log_warn_printf(LOGGER, FMT, ...)  log_printf(LOGGER, ::pvxs::Level::Warn, FMT, __VA_ARGS__)
+#define log_info_printf(LOGGER, FMT, ...)  log_printf(LOGGER, ::pvxs::Level::Info, FMT, __VA_ARGS__)
+#define log_debug_printf(LOGGER, FMT, ...) log_printf(LOGGER, ::pvxs::Level::Debug, FMT, __VA_ARGS__)
 #define log_exc_printf(LOGGER, FMT, ...)   do{ \
     if((LOGGER).test(::pvxs::Level::Crit)) \
        ::pvxs::detail:: _log_printf(unsigned(::pvxs::Level::Crit)|0x1000, "%s " FMT, ::pvxs::detail::log_prefix((LOGGER).name, ::pvxs::Level::Crit), __VA_ARGS__); \
@@ -97,33 +95,6 @@ void xerrlogHexPrintf(const void *buf, size_t buflen);
         errlogPrintf("%s " FMT, ::pvxs::detail::log_prefix((LOGGER).name, LVL), __VA_ARGS__); } \
     }while(0)
 
-#else // _MSVC_TRADITIONAL
-// GCC, clang, or msvc with compliant pre-processor (/experimental:preprocessor)
-// a repeat of the preceding with __VA_ARGS__ -> ##__VA_ARGS__
-
-#define log_printf(LOGGER, LVL, FMT, ...) do{ \
-    if((LOGGER).test(LVL)) \
-       ::pvxs::detail:: _log_printf(unsigned(LVL), "%s " FMT, ::pvxs::detail::log_prefix((LOGGER).name, LVL), ##__VA_ARGS__); \
-}while(0)
-
-#define log_exc_printf(LOGGER, FMT, ...)   do{ \
-    if((LOGGER).test(::pvxs::Level::Crit)) \
-       ::pvxs::detail:: _log_printf(unsigned(::pvxs::Level::Crit)|0x1000, "%s " FMT, ::pvxs::detail::log_prefix((LOGGER).name, ::pvxs::Level::Crit), ##__VA_ARGS__); \
-}while(0)
-
-#define log_hex_printf(LOGGER, LVL, BUF, BUFLEN, FMT, ...) do{ if((LOGGER).test(LVL)) { \
-        xerrlogHexPrintf(BUF, BUFLEN); \
-        errlogPrintf("%s " FMT, ::pvxs::detail::log_prefix((LOGGER).name, LVL), ##__VA_ARGS__); } \
-    }while(0)
-
-#endif // _MSVC_TRADITIONAL
-
-#define log_crit_printf(LOGGER, ...)  log_printf(LOGGER, ::pvxs::Level::Crit, __VA_ARGS__)
-#define log_err_printf(LOGGER, ...)   log_printf(LOGGER, ::pvxs::Level::Err, __VA_ARGS__)
-#define log_warn_printf(LOGGER, ...)  log_printf(LOGGER, ::pvxs::Level::Warn, __VA_ARGS__)
-#define log_info_printf(LOGGER, ...)  log_printf(LOGGER, ::pvxs::Level::Info, __VA_ARGS__)
-#define log_debug_printf(LOGGER, ...) log_printf(LOGGER, ::pvxs::Level::Debug, __VA_ARGS__)
-
 //! Set level for a specific logger
 PVXS_API void logger_level_set(const char *name, int lvl);
 inline void logger_level_set(const char *name, Level lvl) {
diff --git a/src/serverconn.cpp b/src/serverconn.cpp
index 8b58277..06fa6df 100644
--- a/src/serverconn.cpp
+++ b/src/serverconn.cpp
@@ -388,7 +388,7 @@ ServIface::ServIface(const std::string& addr, unsigned short port, server::Serve
     auto orig_port = bind_addr.port();
 
     if(evutil_make_listen_socket_reuseable(sock.sock))
-        log_warn_printf(connsetup, "Unable to make socket reusable\n");
+        log_warn_printf(connsetup, "Unable to make socket reusable%s", "\n");
 
     // try to bind to requested port, then fallback to a random port
     while(true) {