epics/pvxs
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "accommodate gcc vs. msvc handling of empty __VA_ARGS__"

Browse Source 
This reverts commit f7dd311daa.
This commit is contained in:
Michael Davidsaver
2022-01-31 11:06:01 -08:00
parent f7dd311daa
commit 964da05ef2
3 changed files with 8 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ioc/iochooks.cpp
+1 -1
View File
@@ -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) {
src/pvxs/log.h
+6 -35
View File
@@ -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) {
src/serverconn.cpp
+1 -1
View File
@@ -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) {