diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2009-07-30 18:15:21 +0000 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2009-07-30 18:15:21 +0000 |
| commit | f6c4c628f33aa999995b6fd11ea2e202c8b5c7d8 (patch) | |
| tree | 4b744b348e65a1c887b07e954c16160c143a2c65 /packaging | |
| parent | ea15780bdd129931837b32cc5c2ff12f76fbe83a (diff) | |
| download | libgphoto2-f6c4c628f33aa999995b6fd11ea2e202c8b5c7d8.tar.gz | |
Fixed a bunch of C89 and SUS portability issues.
Fixed a buffer overflow in the AOX driver.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@12305 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/generic/print-camera-list.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c index beb8c2621..8fdf7ab98 100644 --- a/packaging/generic/print-camera-list.c +++ b/packaging/generic/print-camera-list.c @@ -315,7 +315,7 @@ human_end_func (const func_params_t *params, void *data) /** C equivalent of basename(1) */ static const char * -basename (const char *pathname) +path_basename (const char *pathname) { char *result, *tmp; /* remove path part from camlib name */ @@ -337,7 +337,7 @@ human_camera_func (const func_params_t *params, void *data) { const char *camlib_basename; - camlib_basename = basename(a->library); + camlib_basename = path_basename(a->library); printf("%3d|%-20s|%-20s|%s\n", i+1, camlib_basename, @@ -435,7 +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) { - if (gpi_string_to_enum(val, &(pdata->version), + unsigned int ver = pdata->version; + if (gpi_string_to_enum(val, &ver, udev_version_t_map)) { FATAL("Unrecognized udev version: \"%s\"", val); } @@ -724,7 +725,7 @@ ddb_camera_func (const func_params_t *params, const CameraAbilities *a, void *data) { - const char *camlib_basename = basename(a->library); + const char *camlib_basename = path_basename(a->library); int head_printed = 0; #define DELAYED_HEAD() \ do { \ |