Commit 950a7f76 by Calvin Buckley

Variadic arguments aren't in C89

This refactors this to a wrapper function, as well as changing the
existing API have a va_list and ... version.
parent 6a7f0403
...@@ -21,31 +21,53 @@ struct git_trace_data { ...@@ -21,31 +21,53 @@ struct git_trace_data {
extern struct git_trace_data git_trace__data; extern struct git_trace_data git_trace__data;
GIT_INLINE(void) git_trace__write_fmt( GIT_INLINE(void) git_trace__vwrite_fmt(
git_trace_level_t level, git_trace_level_t level,
const char *fmt, ...) const char *fmt, va_list ap)
{ {
git_trace_cb callback = git_trace__data.callback; git_trace_cb callback = git_trace__data.callback;
git_buf message = GIT_BUF_INIT; git_buf message = GIT_BUF_INIT;
va_list ap;
va_start(ap, fmt);
git_buf_vprintf(&message, fmt, ap); git_buf_vprintf(&message, fmt, ap);
va_end(ap);
callback(level, git_buf_cstr(&message)); callback(level, git_buf_cstr(&message));
git_buf_dispose(&message); git_buf_dispose(&message);
} }
GIT_INLINE(void) git_trace__write_fmt(
git_trace_level_t level,
const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
git_trace__vwrite_fmt(level, fmt, ap);
va_end(ap);
}
#define git_trace_level() (git_trace__data.level) #define git_trace_level() (git_trace__data.level)
/* Varadic macros are a C99 feature */
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
#define git_trace(l, ...) { \ #define git_trace(l, ...) { \
if (git_trace__data.level >= l && \ if (git_trace__data.level >= l && \
git_trace__data.callback != NULL) { \ git_trace__data.callback != NULL) { \
git_trace__write_fmt(l, __VA_ARGS__); \ git_trace__write_fmt(l, __VA_ARGS__); \
} \ } \
} }
#else
GIT_INLINE(void) git_trace(git_trace_level_t level, const char *fmt, ...)
{
if (git_trace__data.level >= level &&
git_trace__data.callback != NULL) {
va_list ap;
va_start(ap, fmt);
git_trace__vwrite_fmt(level, fmt, ap);
va_end(ap);
}
}
#endif
#else #else
GIT_INLINE(void) git_trace__null( GIT_INLINE(void) git_trace__null(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment