1.1 --- a/ucx/logging.h Fri Feb 08 11:25:04 2013 +0100 1.2 +++ b/ucx/logging.h Fri Feb 08 17:09:12 2013 +0100 1.3 @@ -21,7 +21,7 @@ 1.4 #define UCX_LOGGER_SOURCE 0x04 1.5 1.6 typedef struct { 1.7 - FILE *stream; 1.8 + void *stream; 1.9 write_func writer; 1.10 char *dateformat; 1.11 unsigned int level; 1.12 @@ -29,21 +29,21 @@ 1.13 UcxMap* levels; 1.14 } UcxLogger; 1.15 1.16 -UcxLogger *ucx_logger_new(FILE *stream, unsigned int level, unsigned int mask); 1.17 +UcxLogger *ucx_logger_new(void *stream, unsigned int level, unsigned int mask); 1.18 void ucx_logger_free(UcxLogger* logger); 1.19 1.20 void ucx_logger_logf(UcxLogger *logger, unsigned int level, const char* file, 1.21 const unsigned int line, const char* format, ...); 1.22 -#define ucx_logger_log(logger, level, format...) \ 1.23 - ucx_logger_logf(logger, level, __FILE__, __LINE__, format) 1.24 -#define ucx_logger_error(logger,format...) \ 1.25 - ucx_logger_log(logger, UCX_LOGGER_ERROR, format) 1.26 -#define ucx_logger_info(logger,format...) \ 1.27 - ucx_logger_log(logger, UCX_LOGGER_INFO, format) 1.28 -#define ucx_logger_warn(logger,format...) \ 1.29 - ucx_logger_log(logger, UCX_LOGGER_WARN, format) 1.30 -#define ucx_logger_trace(logger,format...) \ 1.31 - ucx_logger_log(logger, UCX_LOGGER_TRACE, format) 1.32 +#define ucx_logger_log(logger, level, ...) \ 1.33 + ucx_logger_logf(logger, level, __FILE__, __LINE__, __VA_ARGS__) 1.34 +#define ucx_logger_error(logger, ...) \ 1.35 + ucx_logger_log(logger, UCX_LOGGER_ERROR, __VA_ARGS__) 1.36 +#define ucx_logger_info(logger, ...) \ 1.37 + ucx_logger_log(logger, UCX_LOGGER_INFO, __VA_ARGS__) 1.38 +#define ucx_logger_warn(logger, ...) \ 1.39 + ucx_logger_log(logger, UCX_LOGGER_WARN, __VA_ARGS__) 1.40 +#define ucx_logger_trace(logger, ...) \ 1.41 + ucx_logger_log(logger, UCX_LOGGER_TRACE, __VA_ARGS__) 1.42 1.43 #ifdef __cplusplus 1.44 }