diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpg-wks-server.c | 22 | ||||
| -rw-r--r-- | tools/gpgtar-create.c | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tools/gpg-wks-server.c b/tools/gpg-wks-server.c index 6e5e9eb82..addafa27d 100644 --- a/tools/gpg-wks-server.c +++ b/tools/gpg-wks-server.c @@ -1608,22 +1608,22 @@ static gpg_error_t get_domain_list (strlist_t *r_list) { gpg_error_t err; - DIR *dir = NULL; + gnupg_dir_t dir = NULL; char *fname = NULL; - struct dirent *dentry; + gnupg_dirent_t dentry; struct stat sb; strlist_t list = NULL; *r_list = NULL; - dir = opendir (opt.directory); + dir = gnupg_opendir (opt.directory); if (!dir) { err = gpg_error_from_syserror (); goto leave; } - while ((dentry = readdir (dir))) + while ((dentry = gnupg_readdir (dir))) { if (*dentry->d_name == '.') continue; @@ -1663,8 +1663,7 @@ get_domain_list (strlist_t *r_list) leave: free_strlist (list); - if (dir) - closedir (dir); + gnupg_closedir (dir); xfree (fname); return err; } @@ -1677,8 +1676,8 @@ expire_one_domain (const char *top_dirname, const char *domain) gpg_error_t err; char *dirname; char *fname = NULL; - DIR *dir = NULL; - struct dirent *dentry; + gnupg_dir_t dir = NULL; + gnupg_dirent_t dentry; struct stat sb; time_t now = gnupg_get_time (); @@ -1691,7 +1690,7 @@ expire_one_domain (const char *top_dirname, const char *domain) goto leave; } - dir = opendir (dirname); + dir = gnupg_opendir (dirname); if (!dir) { err = gpg_error_from_syserror (); @@ -1700,7 +1699,7 @@ expire_one_domain (const char *top_dirname, const char *domain) goto leave; } - while ((dentry = readdir (dir))) + while ((dentry = gnupg_readdir (dir))) { if (*dentry->d_name == '.') continue; @@ -1749,8 +1748,7 @@ expire_one_domain (const char *top_dirname, const char *domain) err = 0; leave: - if (dir) - closedir (dir); + gnupg_closedir (dir); xfree (dirname); xfree (fname); return err; diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c index 17c24c3d5..c196b96f6 100644 --- a/tools/gpgtar-create.c +++ b/tools/gpgtar-create.c @@ -301,6 +301,8 @@ scan_directory (const char *dname, scanctrl_t scanctrl) gpg_error_t err = 0; #ifdef HAVE_W32_SYSTEM + /* Note that we introduced gnupg_opendir only after we had deployed + * this code and thus we don't change it for now. */ WIN32_FIND_DATAW fi; HANDLE hd = INVALID_HANDLE_VALUE; char *p; |