Attachment 714629 Details for Bug 892228 – suggested patch

[patch] suggested patch

0001-camera-control-fix-gphoto2-dispatch-callbacks.patch (text/plain), 2.51 KB, created by Jiri Popelka on 2013-03-22 15:56:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiri Popelka

Created: 2013-03-22 15:56:38 UTC

Size: 2.51 KB

patch

obsolete

>From 1f906e0d57a1e8b5fa2c9099fdeba582c8865cfe Mon Sep 17 00:00:00 2001
>From: Jiri Popelka <jpopelka@redhat.com>
>Date: Fri, 22 Mar 2013 16:44:12 +0100
>Subject: [PATCH] camera control: fix gphoto2 dispatch callbacks
>
>https://bugzilla.redhat.com/show_bug.cgi?id=892228
>---
> src/common/camera_control.c | 24 ++++++++----------------
> 1 file changed, 8 insertions(+), 16 deletions(-)
>
>diff --git a/src/common/camera_control.c b/src/common/camera_control.c
>index 2d88483..3c53600 100644
>--- a/src/common/camera_control.c
>+++ b/src/common/camera_control.c
>@@ -113,11 +113,9 @@ static void dt_camctl_camera_destroy(dt_camera_t *cam);
> 
> static int logid=0;
> 
>-void _gphoto_log(GPLogLevel level, const char *domain, const char *format, va_list args, void *data)
>+void _gphoto_log(GPLogLevel level, const char *domain, const char *str, void *data)
> {
>-  char log[4096]= {0};
>-  vsprintf(log,format,args);
>-  dt_print(DT_DEBUG_CAMCTL,"[camera_control] %s %s\n",domain,log);
>+  dt_print(DT_DEBUG_CAMCTL,"[camera_control] %s %s\n",domain,str);
> }
> 
> void _enable_debug()
>@@ -139,12 +137,10 @@ static void _idle_func_dispatch(GPContext *context, void *data)
> }
> 
> 
>-static void _error_func_dispatch(GPContext *context, const char *format, va_list args, void *data)
>+static void _error_func_dispatch(GPContext *context, const char *text, void *data)
> {
>   dt_camctl_t *camctl=(dt_camctl_t *)data;
>-  char buffer[4096];
>-  vsprintf (buffer, format, args );
>-  dt_print (DT_DEBUG_CAMCTL,"[camera_control] gphoto2 error: %s\n",buffer);
>+  dt_print (DT_DEBUG_CAMCTL,"[camera_control] gphoto2 error: %s\n",text);
> 
>   if (strstr (buffer,"PTP"))
>   {
>@@ -163,18 +159,14 @@ static void _error_func_dispatch(GPContext *context, const char *format, va_list
>   }
> }
> 
>-static void _status_func_dispatch(GPContext *context, const char *format, va_list args, void *data)
>+static void _status_func_dispatch(GPContext *context, const char *text, void *data)
> {
>-  char buffer[4096];
>-  vsprintf( buffer, format, args );
>-  dt_print(DT_DEBUG_CAMCTL,"[camera_control] gphoto2 status: %s\n",buffer);
>+  dt_print(DT_DEBUG_CAMCTL,"[camera_control] gphoto2 status: %s\n",text);
> }
> 
>-static void _message_func_dispatch(GPContext *context, const char *format, va_list args, void *data)
>+static void _message_func_dispatch(GPContext *context, const char *text, void *data)
> {
>-  char buffer[4096];
>-  vsprintf( buffer, format, args );
>-  dt_print(DT_DEBUG_CAMCTL,"[camera_control] gphoto2 message: %s\n",buffer);
>+  dt_print(DT_DEBUG_CAMCTL,"[camera_control] gphoto2 message: %s\n",text);
> }
> 
> 
>-- 
>1.8.1.4
>

Actions: View | Diff

Attachments on bug 892228: 673206 | 673207 | 673208 | 673209 | 673210 | 673211 | 673212 | 673213 | 673214 | 673215 | 714629