diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2016-01-03 18:04:45 +0100 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2016-01-03 18:04:45 +0100 |
| commit | 29248df3952c7e12d8af6a5456d3763dc29601b6 (patch) | |
| tree | 967bfe6a81d2bde0dcfdc7d41fd3dfdfaf159635 /libgphoto2_port/vusb | |
| parent | b2131c57e8c01f9bed10003a4bfda442e298b935 (diff) | |
| download | libgphoto2-29248df3952c7e12d8af6a5456d3763dc29601b6.tar.gz | |
use gp_system_*dir functions instead of the bare readdir/opendir/closedir
to help with https://github.com/gphoto/libgphoto2/issues/33
Diffstat (limited to 'libgphoto2_port/vusb')
| -rw-r--r-- | libgphoto2_port/vusb/vcamera.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libgphoto2_port/vusb/vcamera.c b/libgphoto2_port/vusb/vcamera.c index 8c72b2a74..c467d786c 100644 --- a/libgphoto2_port/vusb/vcamera.c +++ b/libgphoto2_port/vusb/vcamera.c @@ -21,6 +21,7 @@ #include "config.h" #include <gphoto2/gphoto2-port-library.h> +#include <gphoto2/gphoto2-port-portability.h> #ifdef HAVE_LIBEXIF # include <libexif/exif-data.h> @@ -368,12 +369,12 @@ static uint32_t ptp_objectid = 0; static void read_directories(char *path, struct ptp_dirent *parent) { struct ptp_dirent *cur; - DIR *dir; - struct dirent *de; + gp_system_dir dir; + gp_system_dirent de; - dir = opendir(path); + dir = gp_system_opendir(path); if (!dir) return; - while ((de=readdir(dir))) { + while ((de=gp_system_readdir(dir))) { if (!strcmp(de->d_name,".")) continue; if (!strcmp(de->d_name,"..")) continue; @@ -393,7 +394,7 @@ read_directories(char *path, struct ptp_dirent *parent) { if (S_ISDIR(cur->stbuf.st_mode)) read_directories(cur->fsname, cur); /* recurse! */ } - closedir(dir); + gp_system_closedir(dir); } static void |