From 9d8f4cbcd4962aad23853bf13643dd2bdcd7369f Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 23 Oct 2001 10:36:24 +0000 Subject: [PATCH] made canon debug use gp_log (compiles again!) git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2699 67ed7778-7388-44ab-90cf-0a291f65f57c --- ChangeLog | 7 ++++++- camlibs/canon/util.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cca91725a..5354231ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-23 Hans Ulrich Niedermann + + * camlibs/canon/util.c: made canon debug use gp_log. + this makes canon drv to compile again + 2001-10-23 Lutz Müller Patch from Fredrik : @@ -11,7 +16,7 @@ * camlibs/stv0680: Added support for "Aiptek PenCam Trio" -2001-10-21 Hans Ulrich Niedermann +2001-10-22 Hans Ulrich Niedermann * packages/usbcam.group: added. linux-hotplug script * packages/usbcam.console: added. linux-hotplug script diff --git a/camlibs/canon/util.c b/camlibs/canon/util.c index d84c78fd8..55774e6ad 100644 --- a/camlibs/canon/util.c +++ b/camlibs/canon/util.c @@ -19,6 +19,7 @@ #include +#include "gphoto2-port-log.h" #include "util.h" #include "psa50.h" @@ -108,15 +109,14 @@ dump_hex (Camera *camera, const char *msg, const unsigned char *buf, int len) void debug_message (Camera *camera, const char *msg, ...) { - struct canon_info *cs = (struct canon_info *) camera->camlib_data; - va_list ap; + va_list args; + char buf[4096] +; + va_start (args, msg); + vsnprintf (buf, sizeof(buf), msg, args); + va_end (args); - - if (cs->debug) { - va_start (ap, msg); - vfprintf (stderr, msg, ap); - va_end (ap); - } + gp_log (GP_LOG_DEBUG, "canon", "%s", buf); } /****************************************************************************