diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2010-03-20 22:24:24 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2010-03-20 22:24:24 +0000 |
| commit | 76a214236416032c0510df73cc526e90fa113f24 (patch) | |
| tree | 49363a8e1979f787766d970043e6e2cdee03457b /tests | |
| parent | a68039990f492f8f402d0003b1dee00f580b87d7 (diff) | |
| download | libgphoto2-76a214236416032c0510df73cc526e90fa113f24.tar.gz | |
logging functions are not varargs anymore
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12810 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-camera-list.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/test-camera-list.c b/tests/test-camera-list.c index fa0fda625..3d8038731 100644 --- a/tests/test-camera-list.c +++ b/tests/test-camera-list.c @@ -56,11 +56,8 @@ struct timeval glob_tv_zero = { 0, 0 }; static void -#ifdef __GNUC__ - __attribute__((__format__(printf,3,0))) -#endif -debug_func (GPLogLevel level, const char *domain, const char *format, - va_list args, void __unused__ *data) +debug_func (GPLogLevel level, const char *domain, const char *str, + void __unused__ *data) { struct timeval tv; long sec, usec; @@ -69,9 +66,7 @@ debug_func (GPLogLevel level, const char *domain, const char *format, sec = tv.tv_sec - glob_tv_zero.tv_sec; usec = tv.tv_usec - glob_tv_zero.tv_usec; if (usec < 0) {sec--; usec += 1000000L;} - fprintf (stderr, "%li.%06li %s(%i): ", sec, usec, domain, level); - vfprintf (stderr, format, args); - fputc ('\n', stderr); + fprintf (stderr, "%li.%06li %s(%i): %s\n", sec, usec, domain, level, str); } |