diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2010-03-06 14:42:22 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2010-03-06 14:42:22 +0000 |
| commit | 2f935edb8d7c185216fbf24469321c8fd03f068c (patch) | |
| tree | cdfc1a6996b522ff5f3b41c570dbc4ac7d3d0472 /gphoto2 | |
| parent | 96e59fbc51b26ca9efb230ffe47b1b2162c7f819 (diff) | |
| download | libgphoto2-2f935edb8d7c185216fbf24469321c8fd03f068c.tar.gz | |
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
Diffstat (limited to 'gphoto2')
| -rw-r--r-- | gphoto2/gphoto2-context.h | 36 |
1 files changed, 6 insertions, 30 deletions
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, |