diff options
author | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2007-08-02 11:03:14 +0000 |
---|---|---|
committer | Hans Ulrich Niedermann <gp@n-dimensional.de> | 2007-08-02 11:03:14 +0000 |
commit | 692fcaca509dc13b992dcca335cf8d60f49e74ec (patch) | |
tree | 17073b9c900811c80cb13e38ba6b84aab78b72eb /packaging | |
parent | 0b7d3bfcb968f60f9eb9fc7496e4f3bd5328b772 (diff) | |
download | libgphoto2-692fcaca509dc13b992dcca335cf8d60f49e74ec.tar.gz |
Get rid of C99isms (based on) patch by Dan Fandrich
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10525 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/generic/print-camera-list.c | 48 |
1 files changed, 20 insertions, 28 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index 76336a7ef..9d6bad850 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -382,14 +382,31 @@ typedef struct { char *owner; char *group; char *script; - char *begin_string; - char *usbcam_string; + const char *begin_string; + const char *usbcam_string; } udev_persistent_data_t; static void udev_parse_params (const func_params_t *params, void **data) { + /* Note: 2 lines because we need to use || ... having them on the same + * line would mean &&. + */ + static const char * const begin_strings[] = { + /* UDEV_PRE_0_98 */ + "BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n" + "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n", + /* UDEV_0_98 */ + "SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n" + "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n" + }; + static const char * const usbcam_strings[] = { + /* UDEV_PRE_0_98 */ + "SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ", + /* UDEV_0_98 */ + "ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ", + }; udev_persistent_data_t *pdata; pdata = calloc(1, sizeof(udev_persistent_data_t)); pdata->version = UDEV_0_98; @@ -436,37 +453,12 @@ udev_parse_params (const func_params_t *params, void **data) FATAL("The <script> parameter conflicts with the <mode,group,owner> parameters."); } - /* Note: 2 lines because we need to use || ... having them on the same - * line would mean &&. - */ - static char *begin_strings[] = { - /* UDEV_PRE_0_98 */ - "BUS!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n" - "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n", - /* UDEV_0_98 */ - "SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n" - "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n" - }; - static char *usbcam_strings[] = { - /* UDEV_PRE_0_98 */ - "SYSFS{idVendor}==\"%04x\", SYSFS{idProduct}==\"%04x\", ", - /* UDEV_0_98 */ - "ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ", - }; pdata->begin_string = begin_strings[pdata->version]; pdata->usbcam_string = usbcam_strings[pdata->version]; } -static void -version_str_func(const char *str, void *data) -{ - const char **foo = (const char **)data; - fprintf(stdout, "V[%s]", str); - fflush(stdout); - *foo = str; -} -static inline const char * +static const char * get_version_str(udev_version_t version) { return gpi_enum_to_string(version, udev_version_t_map); |