Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › b91acea
pkgdb_lock/unlock were misnamed: calling pkgdb_unlock() does not necessarily cause the database to be unlocked because of the sysem of lock-counting employed.
Matthew Seaman committed 13 years ago
commit b91acea169c56f6328c9aaedfd20efa5b407fceb
parent 693a38e
3 files changed +6 -6
modified libpkg/pkg_jobs.c
@@ -91,7 +91,7 @@ pkg_jobs_free(struct pkg_jobs *j)
		return;



	if ((j->flags & PKG_FLAG_DRY_RUN) == 0)
- 
		pkgdb_unlock(j->db);
+ 
		pkgdb_release_lock(j->db);



	HASH_FREE(j->jobs, pkg, pkg_free);

	LIST_FREE(&j->patterns, jp, free);
@@ -267,7 +267,7 @@ pkg_jobs_solve(struct pkg_jobs *j)
	if ((j->flags & PKG_FLAG_DRY_RUN) != PKG_FLAG_DRY_RUN)

		dry_run = true;
- 
	if (!dry_run && pkgdb_lock(j->db) != EPKG_OK)
+ 
	if (!dry_run && pkgdb_obtain_lock(j->db) != EPKG_OK)

		return (EPKG_FATAL);
modified libpkg/pkgdb.c
@@ -3868,7 +3868,7 @@ pkgshell_open(const char **reponame)
}



int
- 
pkgdb_lock(struct pkgdb *db)
+ 
pkgdb_obtain_lock(struct pkgdb *db)

{

	assert(db != NULL);

	assert(db->lock_count >= 0);
@@ -3880,7 +3880,7 @@ pkgdb_lock(struct pkgdb *db)
}



int
- 
pkgdb_unlock(struct pkgdb *db)
+ 
pkgdb_release_lock(struct pkgdb *db)

{

	assert(db != NULL);

	assert(db->lock_count >= 0);
modified libpkg/private/pkgdb.h
@@ -62,8 +62,8 @@ struct pkgdb_it *pkgdb_query_upgrades(struct pkgdb *db, const char *reponame, bo
struct pkgdb_it *pkgdb_query_installs(struct pkgdb *db, match_t type, int nbpkgs, char **pkgs, const char *reponame, bool force, bool recursive);

struct pkgdb_it *pkgdb_query_fetch(struct pkgdb *db, match_t type, int nbpkgs, char **pkgs, const char *reponame, unsigned flags);
- 
int pkgdb_lock(struct pkgdb *db);
- 
int pkgdb_unlock(struct pkgdb *db);
+ 
int pkgdb_obtain_lock(struct pkgdb *db);
+ 
int pkgdb_release_lock(struct pkgdb *db);



void pkgshell_open(const char **r);

#endif