Changeset: 7f5066b827ab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7f5066b827ab
Modified Files:
gdk/gdk.h
gdk/gdk_private.h
gdk/gdk_system_private.h
gdk/gdk_tracer.c
gdk/gdk_tracer.h
Branch: default
Log Message:
Remove non-standard use of ##__VA_ARGS__.
Note, C23 has __VA_OPT__ which could be used, if only current compilers
supported that already.
diffs (194 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1712,14 +1712,14 @@ BATnegateprops(BAT *b)
gdk_export gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT
*log_level);
-#define GDKerror(format, ...) \
+#define GDKerror(...) \
GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
- GDK, NULL, format, ##__VA_ARGS__)
-#define GDKsyserr(errno, format, ...) \
+ GDK, NULL, __VA_ARGS__)
+#define GDKsyserr(errno, ...) \
GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
GDK, GDKstrerror(errno, (char[64]){0}, 64), \
- format, ##__VA_ARGS__)
-#define GDKsyserror(format, ...) GDKsyserr(errno, format, ##__VA_ARGS__)
+ __VA_ARGS__)
+#define GDKsyserror(...) GDKsyserr(errno, __VA_ARGS__)
gdk_export void GDKclrerr(void);
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -173,9 +173,9 @@ gdk_return GDKtracer_init(const char *db
__attribute__((__visibility__("hidden")));
gdk_return GDKunlink(int farmid, const char *dir, const char *nme, const char
*extension)
__attribute__((__visibility__("hidden")));
-#define GDKwarning(format, ...) \
+#define GDKwarning(...) \
GDKtracer_log(__FILE__, __func__, __LINE__, M_WARNING, \
- GDK, NULL, format, ##__VA_ARGS__)
+ GDK, NULL, __VA_ARGS__)
lng getBBPlogno(void)
__attribute__((__visibility__("hidden")));
BUN HASHappend(BAT *b, BUN i, const void *v)
diff --git a/gdk/gdk_system_private.h b/gdk/gdk_system_private.h
--- a/gdk/gdk_system_private.h
+++ b/gdk/gdk_system_private.h
@@ -25,7 +25,7 @@ bool MT_kill_threads(void)
bool MT_thread_override_limits(void)
__attribute__((__visibility__("hidden")));
#ifdef NATIVE_WIN32
-#define GDKwinerror(format, ...) \
+#define GDKwinerror(...) \
do { \
char _osmsgbuf[128]; \
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, \
@@ -34,7 +34,7 @@ bool MT_thread_override_limits(void)
(LPTSTR) _osmsgbuf, sizeof(_osmsgbuf), \
NULL); \
GDKtracer_log(__FILE__, __func__, __LINE__, M_ERROR, \
- GDK, _osmsgbuf, format, ##__VA_ARGS__); \
+ GDK, _osmsgbuf, __VA_ARGS__); \
SetLastError(0); \
} while (0)
#endif
diff --git a/gdk/gdk_tracer.c b/gdk/gdk_tracer.c
--- a/gdk/gdk_tracer.c
+++ b/gdk/gdk_tracer.c
@@ -69,7 +69,22 @@ static const char *level_str[] = {
* GDKtracer Stream Macros
*/
// Exception
-#define GDK_TRACER_EXCEPTION(MSG, ...) \
+#define GDK_TRACER_EXCEPTION(MSG) \
+ fprintf(stderr, \
+ "%s " \
+ "%-"MXW"s " \
+ "%"MXW"s:%d " \
+ "%"MXW"s " \
+ "%-"MXW"s " \
+ "%-"MXW"s # "MSG, \
+ get_timestamp((char[TS_SIZE]){0}, TS_SIZE), \
+ __FILE__, \
+ __func__, \
+ __LINE__, \
+ STR(M_CRITICAL), \
+ STR(GDK_TRACER), \
+ MT_thread_getname());
+#define GDK_TRACER_EXCEPTION2(MSG, ...) \
fprintf(stderr, \
"%s " \
"%-"MXW"s " \
@@ -84,7 +99,7 @@ static const char *level_str[] = {
STR(M_CRITICAL), \
STR(GDK_TRACER), \
MT_thread_getname(), \
- ## __VA_ARGS__);
+ __VA_ARGS__);
#define GDK_TRACER_RESET_OUTPUT() \
@@ -157,8 +172,8 @@ GDKtracer_init_trace_file(const char *db
active_tracer = MT_fopen(file_name, "a");
if (active_tracer == NULL) {
- GDK_TRACER_EXCEPTION("Failed to open %s: %s\n", file_name,
- GDKstrerror(errno, (char[64]){0}, 64));
+ GDK_TRACER_EXCEPTION2("Failed to open %s: %s\n", file_name,
+ GDKstrerror(errno, (char[64]){0}, 64));
/* uninitialize */
free(file_name);
file_name = NULL;
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -148,38 +148,38 @@ gdk_export ATOMIC_TYPE lvl_per_component
(log_level_t) ATOMIC_GET(&lvl_per_component[COMP]) >= LOG_LEVEL)
-#define GDK_TRACER_LOG_BODY(LOG_LEVEL, COMP, MSG, ...) \
+#define GDK_TRACER_LOG_BODY(LOG_LEVEL, COMP, ...) \
GDKtracer_log(__FILE__, __func__, __LINE__, \
- LOG_LEVEL, COMP, NULL, MSG, ##__VA_ARGS__)
+ LOG_LEVEL, COMP, NULL, __VA_ARGS__)
#ifdef __COVERITY__
/* hide this for static code analysis: too many false positives */
#define GDK_TRACER_LOG(LOG_LEVEL, COMP, MSG, ...) ((void) 0)
#else
-#define GDK_TRACER_LOG(LOG_LEVEL, COMP, MSG, ...) \
+#define GDK_TRACER_LOG(LOG_LEVEL, COMP, ...) \
do { \
if (GDK_TRACER_TEST(LOG_LEVEL, COMP)) { \
- GDK_TRACER_LOG_BODY(LOG_LEVEL, COMP, MSG, \
- ## __VA_ARGS__); \
+ GDK_TRACER_LOG_BODY(LOG_LEVEL, COMP, \
+ __VA_ARGS__); \
} \
} while (0)
#endif
-#define TRC_CRITICAL(COMP, MSG, ...) \
- GDK_TRACER_LOG_BODY(M_CRITICAL, COMP, MSG, ## __VA_ARGS__)
+#define TRC_CRITICAL(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_CRITICAL, COMP, __VA_ARGS__)
-#define TRC_ERROR(COMP, MSG, ...) \
- GDK_TRACER_LOG_BODY(M_ERROR, COMP, MSG, ## __VA_ARGS__)
+#define TRC_ERROR(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_ERROR, COMP, __VA_ARGS__)
-#define TRC_WARNING(COMP, MSG, ...) \
- GDK_TRACER_LOG_BODY(M_WARNING, COMP, MSG, ## __VA_ARGS__)
+#define TRC_WARNING(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_WARNING, COMP, __VA_ARGS__)
-#define TRC_INFO(COMP, MSG, ...) \
- GDK_TRACER_LOG(M_INFO, COMP, MSG, ## __VA_ARGS__)
+#define TRC_INFO(COMP, ...) \
+ GDK_TRACER_LOG(M_INFO, COMP, __VA_ARGS__)
-#define TRC_DEBUG(COMP, MSG, ...) \
- GDK_TRACER_LOG(M_DEBUG, COMP, MSG, ## __VA_ARGS__)
+#define TRC_DEBUG(COMP, ...) \
+ GDK_TRACER_LOG(M_DEBUG, COMP, __VA_ARGS__)
@@ -212,20 +212,20 @@ gdk_export ATOMIC_TYPE lvl_per_component
if (GDK_TRACER_TEST(M_DEBUG, COMP))
-#define TRC_CRITICAL_ENDIF(COMP, MSG, ...) \
- GDK_TRACER_LOG_BODY(M_CRITICAL, COMP, MSG, ## __VA_ARGS__)
+#define TRC_CRITICAL_ENDIF(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_CRITICAL, COMP, __VA_ARGS__)
-#define TRC_ERROR_ENDIF(COMP, MSG, ...)
\
- GDK_TRACER_LOG_BODY(M_ERROR, COMP, MSG, ## __VA_ARGS__)
+#define TRC_ERROR_ENDIF(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_ERROR, COMP, __VA_ARGS__)
-#define TRC_WARNING_ENDIF(COMP, MSG, ...) \
- GDK_TRACER_LOG_BODY(M_WARNING, COMP, MSG, ## __VA_ARGS__)
+#define TRC_WARNING_ENDIF(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_WARNING, COMP, __VA_ARGS__)
-#define TRC_INFO_ENDIF(COMP, MSG, ...) \
- GDK_TRACER_LOG_BODY(M_INFO, COMP, MSG, ## __VA_ARGS__)
+#define TRC_INFO_ENDIF(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_INFO, COMP, __VA_ARGS__)
-#define TRC_DEBUG_ENDIF(COMP, MSG, ...)
\
- GDK_TRACER_LOG_BODY(M_DEBUG, COMP, MSG, ## __VA_ARGS__)
+#define TRC_DEBUG_ENDIF(COMP, ...) \
+ GDK_TRACER_LOG_BODY(M_DEBUG, COMP, __VA_ARGS__)
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
