e43d936 Small optimisation/clean for pkgdb_cache rebuild — HardenedBSD-pkg

HardenedBSD Package Manager

Small optimisation/clean for pkgdb_cache rebuild

Philippe Pepiot committed 15 years ago

commit e43d93661f9f60ffb38ba8973713a30352f7a9ce
parent 4486e475552d1bc42ddb3fd5e4f8b897982a2a25

1 file changed +2 -5

modified libpkg/pkgdb_cache.c

@@ -81,12 +81,11 @@ pkgdb_cache_rebuild(const char *pkg_dbdir, const char *cache_path)

 	char mpath[MAXPATHLEN];
 	char namever[FILENAME_MAX];
 	struct cdb_make cdb;
 	size_t idx = 0;
 	size_t idep;
 	struct pkg_manifest **m = NULL;
 	DIR *dir;
 	struct dirent *pkg_dir;
 	size_t nb_pkg = 0;
 	size_t nb_pkg = 0, idx = 0;
 	snprintf(tmppath, sizeof(tmppath), "%s/pkgdb.cache-XXXXX", pkg_dbdir);

@@ -111,7 +110,6 @@ pkgdb_cache_rebuild(const char *pkg_dbdir, const char *cache_path)

 		rewinddir(dir);
 		m = calloc(nb_pkg, sizeof(*m));
 		idx = 0;
 		while ((pkg_dir = readdir(dir)) != NULL) {
 			if (pkg_dir->d_type == DT_DIR && /* TODO stat(2) for symlinks ? */

@@ -129,15 +127,14 @@ pkgdb_cache_rebuild(const char *pkg_dbdir, const char *cache_path)

 						continue;
 					}
 				}
 				idx++;
 			}
 			nb_pkg = idx; /* real number of manifest loaded */
 		}
 		closedir(dir);
 	}
 	/* sort manifests */
 	nb_pkg = idx; /* real number of manifest loaded */
 	qsort(m, nb_pkg, sizeof(struct pkg_manifest *), pkg_manifest_cmp);
 	for (idx = 0; idx < nb_pkg; idx++) {