diff options
| author | Hugo Beauzée-Luyssen <hugo@beauzee.fr> | 2019-02-21 14:49:36 +0100 |
|---|---|---|
| committer | Hugo Beauzée-Luyssen <hugo@beauzee.fr> | 2019-02-21 16:12:58 +0100 |
| commit | 4c5309c266df33d62d61381bc93428a072c516a4 (patch) | |
| tree | 6052e74c5168646080ef908cdabaa2406d480c78 | |
| parent | 56f3941d3f9e6e9e8e0efa177408110daf6ac10f (diff) | |
| download | gnutls-4c5309c266df33d62d61381bc93428a072c516a4.tar.gz | |
lib: x509: Minor directory browsing simplification
Signed-off-by: Hugo Beauzée-Luyssen <hugo@beauzee.fr>
| -rw-r--r-- | lib/x509/verify-high2.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c index 56d52c0b1a..ff574ababe 100644 --- a/lib/x509/verify-high2.c +++ b/lib/x509/verify-high2.c @@ -400,13 +400,11 @@ int load_dir_certs(const char *dirname, dirp = opendir(dirname); if (dirp != NULL) { - do { - d = readdir(dirp); - if (d != NULL + while ((d = readdir(dirp)) != NULL) { #ifdef _DIRENT_HAVE_D_TYPE - && (d->d_type == DT_REG || d->d_type == DT_LNK || d->d_type == DT_UNKNOWN) + if (d->d_type == DT_REG || d->d_type == DT_LNK || d->d_type == DT_UNKNOWN) #endif - ) { + { snprintf(path, sizeof(path), "%s/%s", dirname, d->d_name); @@ -425,7 +423,6 @@ int load_dir_certs(const char *dirname, r += ret; } } - while (d != NULL); closedir(dirp); } #else /* _WIN32 */ |