diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-08-11 15:11:16 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-08-11 15:11:16 +0000 |
| commit | f20f69384dad3ee2ae9541f146c1b04d83b26499 (patch) | |
| tree | abf64884b34ee4b8afedad0b11efe4799163902a /packaging | |
| parent | 708e4d1a994a329dd05f1c0633978cfead385099 (diff) | |
| download | libgphoto2-f20f69384dad3ee2ae9541f146c1b04d83b26499.tar.gz | |
fixed version checker code.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12375 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/generic/print-camera-list.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index 8fdf7ab98..a2369fa21 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -435,8 +435,8 @@ udev_parse_params (const func_params_t *params, void **data) } else if (strcmp("group", key)==0) { pdata->group = val; } else if (strcmp("version", key)==0) { - unsigned int ver = pdata->version; - if (gpi_string_to_enum(val, &ver, + unsigned int *ver = &pdata->version; + if (gpi_string_to_enum(val, ver, udev_version_t_map)) { FATAL("Unrecognized udev version: \"%s\"", val); } @@ -451,11 +451,11 @@ udev_parse_params (const func_params_t *params, void **data) } } if ((0==0) - && pdata->mode == NULL - && pdata->group == NULL - && pdata->owner == NULL - && pdata->script == NULL - && pdata->version <= UDEV_0_98) { + && (pdata->mode == NULL) + && (pdata->group == NULL) + && (pdata->owner == NULL) + && (pdata->script == NULL) + && (pdata->version <= UDEV_0_98)) { FATAL("Either <script> or <mode,group,owner> parameters must be given."); } if ((pdata->script != NULL) && (pdata->mode != NULL |