diff options
| author | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-11-21 14:49:37 +0100 |
|---|---|---|
| committer | Igor Gnatenko <i.gnatenko.brain@gmail.com> | 2016-11-21 14:49:37 +0100 |
| commit | d6c6699cb5a316dca4f1023e657ccb84e6c659ae (patch) | |
| tree | ad31b5a9fe6dbe88642a68dce00c634df63d80eb /packaging | |
| parent | 5eac752b8f0895e0fb65d10d24d3606b3ab9d579 (diff) | |
| download | libgphoto2-d6c6699cb5a316dca4f1023e657ccb84e6c659ae.tar.gz | |
print-camera-list: fix gip_enum_to_string() usage
print-camera-list.c: In function 'ddb_delayed_head':
print-camera-list.c:887:2: error: too many arguments to function 'gpi_enum_to_string'
gpi_enum_to_string(a->device_type,
^~~~~~~~~~~~~~~~~~
In file included from ../../libgphoto2_port/gphoto2/gphoto2-port-info-list.h:63:0,
from ../../gphoto2/gphoto2-abilities-list.h:30,
from ../../gphoto2/gphoto2-camera.h:50,
from print-camera-list.c:53:
../../libgphoto2_port/gphoto2/gphoto2-port-log.h:185:3: note: declared here
gpi_enum_to_string(const unsigned int _enum,
^~~~~~~~~~~~~~~~~~
print-camera-list.c:897:2: error: too many arguments to function 'gpi_enum_to_string'
gpi_enum_to_string(a->status,
^~~~~~~~~~~~~~~~~~
In file included from ../../libgphoto2_port/gphoto2/gphoto2-port-info-list.h:63:0,
from ../../gphoto2/gphoto2-abilities-list.h:30,
from ../../gphoto2/gphoto2-camera.h:50,
from print-camera-list.c:53:
../../libgphoto2_port/gphoto2/gphoto2-port-log.h:185:3: note: declared here
gpi_enum_to_string(const unsigned int _enum,
^~~~~~~~~~~~~~~~~~
Fixes: 43d9449161d1 ("New syntax for print-camera-list's udev output")
References: https://github.com/gphoto/libgphoto2/issues/109
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/generic/print-camera-list.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index dc3599131..b0b0bee5f 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -883,22 +883,14 @@ ddb_delayed_head(const func_params_t *params, printf("device \"%s\" {\n", a->model); printf(" device_type"); - first = 1; - gpi_enum_to_string(a->device_type, - gpi_gphoto_device_type_map, - ddb_list_out_func, - (void *) &first); - printf(";\n"); + printf(" %s;\n", gpi_enum_to_string(a->device_type, + gpi_gphoto_device_type_map); printf(" driver \"%s\";\n", camlib_basename); printf(" driver_status"); - first = 1; - gpi_enum_to_string(a->status, - gpi_camera_driver_status_map, - ddb_list_out_func, - (void *) &first); - printf(";\n"); + printf(" %s;\n", gpi_enum_to_string(a->status, + gpi_camera_driver_status_map); printf(" operations"); first = 1; |