From 7e22e08e2ab09cd3c2317f5e80e8ee47d46eff4b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 21 Oct 2020 16:59:38 +0200 Subject: common: New functions gnupg_opendir et al. * common/sysutils.h (struct gnupg_dirent_s): New. * common/sysutils.c: Include dirent.h. (struct gnupg_dir_s): New. (gnupg_opendir, gnupg_readdir, gnupg_closedir): New. Change all callers of opendir, readdir, and closedir to use these functions. -- GnuPG-bug-id: 5098 --- dirmngr/certcache.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dirmngr/certcache.c') diff --git a/dirmngr/certcache.c b/dirmngr/certcache.c index 04da510a0..9ca6069a2 100644 --- a/dirmngr/certcache.c +++ b/dirmngr/certcache.c @@ -364,8 +364,8 @@ static gpg_error_t load_certs_from_dir (const char *dirname, unsigned int trustclass) { gpg_error_t err; - DIR *dir; - struct dirent *ep; + gnupg_dir_t dir; + gnupg_dirent_t ep; char *p; size_t n; estream_t fp; @@ -373,13 +373,13 @@ load_certs_from_dir (const char *dirname, unsigned int trustclass) ksba_cert_t cert; char *fname = NULL; - dir = opendir (dirname); + dir = gnupg_opendir (dirname); if (!dir) { return 0; /* We do not consider this a severe error. */ } - while ( (ep=readdir (dir)) ) + while ( (ep = gnupg_readdir (dir)) ) { p = ep->d_name; if (*p == '.' || !*p) @@ -447,7 +447,7 @@ load_certs_from_dir (const char *dirname, unsigned int trustclass) } xfree (fname); - closedir (dir); + gnupg_closedir (dir); return 0; } -- cgit v1.2.3