Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=608f646525985ad9f8be86ed7178024cec1c25a0

commit 608f646525985ad9f8be86ed7178024cec1c25a0
Author: Michel Hermier <[email protected]>
Date:   Wed Oct 8 12:34:55 2014 +0200

libpacman: Simplify Database::remove_pkgfromcache removal code.

diff --git a/lib/libpacman/database_cache.cpp b/lib/libpacman/database_cache.cpp
index a88c49d..1c7cb94 100644
--- a/lib/libpacman/database_cache.cpp
+++ b/lib/libpacman/database_cache.cpp
@@ -116,19 +116,17 @@ int Database::add_pkgincache(Package *pkg)

int Database::remove_pkgfromcache(Package *pkg)
{
-       Package *data;
-
if(pkg == NULL) {
return(-1);
}

-       if(!pkgcache.remove(pkg, f_ptrcmp, &data)) {
+       if(!pkgcache.remove(pkg)) {
/* package not found */
return(-1);
}

_pacman_log(PM_LOG_DEBUG, _("removing entry '%s' from '%s' cache"), 
pkg->name(), treename());
-       data->release(); // FIXME: Should not be necessary, but required during 
migration to refcounted object
+       pkg->release(); // FIXME: Should not be necessary, but required during 
migration to refcounted object

_pacman_db_clear_grpcache(this);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to