882a1fc Little cleanup — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Little cleanup

Baptiste Daroussin committed 15 years ago

commit 882a1fc7a92ed4cab34d5513786f138e788a7055
parent 2d39162

2 files changed +8 -3

modified libpkg/pkgdb_cache.c

@@ -68,7 +68,7 @@ pkgdb_cache_rebuild(const char *pkg_dbdir, const char *cache_path)

 	int nb_packages = 0;
 	strlcpy(tmppath, pkg_dbdir, MAXPATHLEN);
 	strlcat(tmppath, "/pkgdb.cache", MAXPATHLEN);
 	strlcat(tmppath, "/pkgdb.cache-XXXXX", MAXPATHLEN);
 	printf("Rebuilding cache...\n");
 	fd = mkstemp(tmppath);

@@ -94,10 +94,10 @@ pkgdb_cache_rebuild(const char *pkg_dbdir, const char *cache_path)

 				nb_packages++;
 				snprintf(key, BUFSIZ, "%d_name",nb_packages);
 				value = cJSON_GetObjectItem(manifest, "name")->valuestring;
 				cdb_make_add(&cdb_make, key, strlen(key), value, strlen(value));
 				ADD_CACHE(&cdb_make, key, value);
 				snprintf(key, BUFSIZ, "%d_version", nb_packages);
 				value = cJSON_GetObjectItem(manifest, "version")->valuestring;
 				cdb_make_add(&cdb_make, key, strlen(key), value, strlen(value));
 				ADD_CACHE(&cdb_make, key, value);
 				cJSON_Delete(manifest);
 			}

modified libpkg/pkgdb_cache.h

@@ -2,6 +2,11 @@

 #define _PKGDB_CACHE_H
 #include "pkgdb.h"
 #define ADD_CACHE(db, key, val) \
 	do { \
 		cdb_make_add((db), key, strlen(key), val, strlen(val)); \
 	} while (0)
 void pkgdb_cache_update(void);
 struct pkg **pkgdb_cache_list_packages(void);