Commit c576e208 authored by Jean-Paul Saman's avatar Jean-Paul Saman

fix a bug with HAVE_VARIADIC_MACROS message() function

The code referred to a not defined DVBPSI_MSG_FORMAT define and a not define variable inside the HAVE_VARIADIC_MACROS code block.
parent 78ec5855
...@@ -467,6 +467,8 @@ bool dvbpsi_PushPacket(dvbpsi_t *handle, uint8_t* p_data) ...@@ -467,6 +467,8 @@ bool dvbpsi_PushPacket(dvbpsi_t *handle, uint8_t* p_data)
# define DVBPSI_MSG_SIZE 1024 # define DVBPSI_MSG_SIZE 1024
#endif #endif
#define DVBPSI_MSG_FORMAT "libdvbpsi (%s): %s"
#ifdef HAVE_VARIADIC_MACROS #ifdef HAVE_VARIADIC_MACROS
void message(dvbpsi_t *dvbpsi, const dvbpsi_msg_level_t level, const char *fmt, ...) void message(dvbpsi_t *dvbpsi, const dvbpsi_msg_level_t level, const char *fmt, ...)
{ {
...@@ -482,7 +484,7 @@ void message(dvbpsi_t *dvbpsi, const dvbpsi_msg_level_t level, const char *fmt, ...@@ -482,7 +484,7 @@ void message(dvbpsi_t *dvbpsi, const dvbpsi_msg_level_t level, const char *fmt,
msg = malloc(DVBPSI_MSG_SIZE); msg = malloc(DVBPSI_MSG_SIZE);
if (msg == NULL) if (msg == NULL)
return; return;
if (snprintf(&msg, DVBPSI_MSG_SIZE, DVBPSI_MSG_FORMAT, src) < 0) { if (snprintf(&msg, DVBPSI_MSG_SIZE, DVBPSI_MSG_FORMAT, ap) < 0) {
free(msg); free(msg);
return; return;
} }
...@@ -497,7 +499,6 @@ void message(dvbpsi_t *dvbpsi, const dvbpsi_msg_level_t level, const char *fmt, ...@@ -497,7 +499,6 @@ void message(dvbpsi_t *dvbpsi, const dvbpsi_msg_level_t level, const char *fmt,
} }
} }
#else #else
# define DVBPSI_MSG_FORMAT "libdvbpsi (%s): %s"
/* Common code for printing messages */ /* Common code for printing messages */
# if defined(_GNU_SOURCE) # if defined(_GNU_SOURCE)
......
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