Mercurial > hg > xmms-sid
changeset 297:ac9a484e3430
Make XSERR into function.
Use ISO C99 variadic macro style instead of non-portable gcc style.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 25 Dec 2004 18:58:02 +0000 |
| parents | 4279cc6a3412 |
| children | 5db529b397bd |
| files | src/xmms-sid.c src/xmms-sid.h |
| diffstat | 2 files changed, 18 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmms-sid.c Sat Dec 25 18:57:00 2004 +0000 +++ b/src/xmms-sid.c Sat Dec 25 18:58:02 2004 +0000 @@ -26,6 +26,8 @@ #include <stdlib.h> #endif +#include <stdarg.h> + #include <xmms/plugin.h> #include <xmms/util.h> @@ -94,6 +96,18 @@ /* + * Error messages + */ +void xs_error(const char *fmt, ...) +{ + va_list ap; + fprintf(stderr, "XMMS-SID: "); + va_start(ap); + vfprintf(stderr, fmt, ap); + va_end(ap); +} + +/* * Initialization functions */ void xs_reinit(void)
--- a/src/xmms-sid.h Sat Dec 25 18:57:00 2004 +0000 +++ b/src/xmms-sid.h Sat Dec 25 18:58:02 2004 +0000 @@ -189,7 +189,7 @@ gint xs_get_time(void); void xs_get_song_info(gchar *, gchar **, gint *); void xs_about(void); - +void xs_error(const char *, ...); gint xs_rateconv_filter(void *, void *, AFormat, gint, gint); t_xs_tuneinfo *xs_tuneinfo_new(gchar *, gint, gint, gchar *, gchar *, gchar *, gint, gint, gint, gint); @@ -198,14 +198,13 @@ /* Debugging and error handling macros */ +#ifdef #ifdef DEBUG -#define XSDEBUG(x...) { fprintf(stderr, "XS[%s:%s:%d]: ", __FILE__, __FUNCTION__, (int) __LINE__); fprintf(stderr, ## x); } +#define XSDEBUG(...) { fprintf(stderr, "XS[%s:%s:%d]: ", __FILE__, __FUNCTION__, (int) __LINE__); fprintf(stderr, __VA_ARGS__); } #else -#define XSDEBUG(x...) /* foo */ +#define XSDEBUG(...) /* foo */ #endif -#define XSERR(x...) { fprintf(stderr, PACKAGE_NAME ": "); fprintf(stderr, ## x); } - #ifdef __cplusplus }