From 2f935edb8d7c185216fbf24469321c8fd03f068c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 6 Mar 2010 14:42:22 +0000 Subject: use strings to pass out strings to frontends git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12735 67ed7778-7388-44ab-90cf-0a291f65f57c --- gphoto2/gphoto2-context.h | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) (limited to 'gphoto2') diff --git a/gphoto2/gphoto2-context.h b/gphoto2/gphoto2-context.h index c53034ef6..3933e2402 100644 --- a/gphoto2/gphoto2-context.h +++ b/gphoto2/gphoto2-context.h @@ -59,41 +59,17 @@ typedef enum _GPContextFeedback { /* Functions */ typedef void (* GPContextIdleFunc) (GPContext *context, void *data); -typedef void (* GPContextErrorFunc) (GPContext *context, const char *format, - va_list args, void *data) -#if (__GNUC__ >= 3) - __attribute__((__format__(printf,2,0))) -#endif -; -typedef void (* GPContextStatusFunc) (GPContext *context, const char *format, - va_list args, void *data) -#if (__GNUC__ >= 3) - __attribute__((__format__(printf,2,0))) -#endif -; -typedef void (* GPContextMessageFunc) (GPContext *context, const char *format, - va_list args, void *data) -#if (__GNUC__ >= 3) - __attribute__((__format__(printf,2,0))) -#endif -; +typedef void (* GPContextErrorFunc) (GPContext *context, const char *text, void *data); +typedef void (* GPContextStatusFunc) (GPContext *context, const char *text, void *data); +typedef void (* GPContextMessageFunc) (GPContext *context, const char *text, void *data); typedef GPContextFeedback (* GPContextQuestionFunc) (GPContext *context, - const char *format, - va_list args, void *data) -#if (__GNUC__ >= 3) - __attribute__((__format__(printf,2,0))) -#endif -; + const char *text, void *data); typedef GPContextFeedback (* GPContextCancelFunc) (GPContext *context, void *data); typedef unsigned int (* GPContextProgressStartFunc) (GPContext *context, float target, - const char *format, - va_list args, void *data) -#if (__GNUC__ >= 3) - __attribute__((__format__(printf,3,0))) -#endif -; + const char *text, + void *data); typedef void (* GPContextProgressUpdateFunc) (GPContext *context, unsigned int id, float current, -- cgit v1.2.1