Move the cache stuff where it should be

Cache bullshit only has relevance to be_files, so move it there.

Signed-off-by: Dan McGee <dan@archlinux.org>
[Allan: BIG rebase]
Signed-off-by: Allan McRae <allan@archlinux.org>

lib/libalpm/Makefile.am

@@ -27,7 +27,6 @@ libalpm_la_SOURCES = \
 	backup.h backup.c \
 	be_files.c \
 	be_package.c \
-	cache.h cache.c \
 	conflict.h conflict.c \
 	db.h db.c \
 	delta.h delta.c \

lib/libalpm/add.c

@@ -40,7 +40,6 @@
 #include "alpm_list.h"
 #include "trans.h"
 #include "util.h"
-#include "cache.h"
 #include "log.h"
 #include "backup.h"
 #include "package.h"

lib/libalpm/be_files.c

@@ -40,12 +40,12 @@
 /* libalpm */
 #include "db.h"
 #include "alpm_list.h"
-#include "cache.h"
 #include "log.h"
 #include "util.h"
 #include "alpm.h"
 #include "handle.h"
 #include "package.h"
+#include "group.h"
 #include "delta.h"
 #include "deps.h"
 #include "dload.h"
@@ -353,6 +353,248 @@ static struct pkg_operations local_pkg_ops = {
 	.changelog_close = _cache_changelog_close,
 };
 
+/* Returns a new package cache from db.
+ * It frees the cache if it already exists.
+ */
+int _alpm_db_load_pkgcache(pmdb_t *db)
+{
+	ALPM_LOG_FUNC;
+
+	if(db == NULL) {
+		return(-1);
+	}
+	_alpm_db_free_pkgcache(db);
+
+	_alpm_log(PM_LOG_DEBUG, "loading package cache for repository '%s'\n",
+			db->treename);
+	if(_alpm_db_populate(db) == -1) {
+		_alpm_log(PM_LOG_DEBUG,
+				"failed to load package cache for repository '%s'\n", db->treename);
+		return(-1);
+	}
+
+	db->pkgcache_loaded = 1;
+	return(0);
+}
+
+void _alpm_db_free_pkgcache(pmdb_t *db)
+{
+	ALPM_LOG_FUNC;
+
+	if(db == NULL || !db->pkgcache_loaded) {
+		return;
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'\n",
+	                        db->treename);
+
+	alpm_list_free_inner(db->pkgcache, (alpm_list_fn_free)_alpm_pkg_free);
+	alpm_list_free(db->pkgcache);
+	db->pkgcache_loaded = 0;
+
+	_alpm_db_free_grpcache(db);
+}
+
+alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
+{
+	ALPM_LOG_FUNC;
+
+	if(db == NULL) {
+		return(NULL);
+	}
+
+	if(!db->pkgcache_loaded) {
+		_alpm_db_load_pkgcache(db);
+	}
+
+	/* hmmm, still NULL ?*/
+	if(!db->pkgcache) {
+		_alpm_log(PM_LOG_DEBUG, "warning: pkgcache is NULL for db '%s'\n", db->treename);
+	}
+
+	return(db->pkgcache);
+}
+
+/* "duplicate" pkg then add it to pkgcache */
+int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg)
+{
+	pmpkg_t *newpkg;
+
+	ALPM_LOG_FUNC;
+
+	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
+		return(-1);
+	}
+
+	newpkg = _alpm_pkg_dup(pkg);
+	if(newpkg == NULL) {
+		return(-1);
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
+						alpm_pkg_get_name(newpkg), db->treename);
+	db->pkgcache = alpm_list_add_sorted(db->pkgcache, newpkg, _alpm_pkg_cmp);
+
+	_alpm_db_free_grpcache(db);
+
+	return(0);
+}
+
+int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
+{
+	void *vdata;
+	pmpkg_t *data;
+
+	ALPM_LOG_FUNC;
+
+	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
+		return(-1);
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n",
+						alpm_pkg_get_name(pkg), db->treename);
+
+	db->pkgcache = alpm_list_remove(db->pkgcache, pkg, _alpm_pkg_cmp, &vdata);
+	data = vdata;
+	if(data == NULL) {
+		/* package not found */
+		_alpm_log(PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n",
+							alpm_pkg_get_name(pkg), db->treename);
+		return(-1);
+	}
+
+	_alpm_pkg_free(data);
+
+	_alpm_db_free_grpcache(db);
+
+	return(0);
+}
+
+pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target)
+{
+	ALPM_LOG_FUNC;
+
+	if(db == NULL) {
+		return(NULL);
+	}
+
+	alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db);
+	if(!pkgcache) {
+		_alpm_log(PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n",
+				target);
+		return(NULL);
+	}
+
+	return(_alpm_pkg_find(pkgcache, target));
+}
+
+/* Returns a new group cache from db.
+ */
+int _alpm_db_load_grpcache(pmdb_t *db)
+{
+	alpm_list_t *lp;
+
+	ALPM_LOG_FUNC;
+
+	if(db == NULL) {
+		return(-1);
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n",
+			db->treename);
+
+	for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
+		const alpm_list_t *i;
+		pmpkg_t *pkg = lp->data;
+
+		for(i = alpm_pkg_get_groups(pkg); i; i = i->next) {
+			const char *grpname = i->data;
+			alpm_list_t *j;
+			pmgrp_t *grp = NULL;
+			int found = 0;
+
+			/* first look through the group cache for a group with this name */
+			for(j = db->grpcache; j; j = j->next) {
+				grp = j->data;
+
+				if(strcmp(grp->name, grpname) == 0
+						&& !alpm_list_find_ptr(grp->packages, pkg)) {
+					grp->packages = alpm_list_add(grp->packages, pkg);
+					found = 1;
+					break;
+				}
+			}
+			if(found) {
+				continue;
+			}
+			/* we didn't find the group, so create a new one with this name */
+			grp = _alpm_grp_new(grpname);
+			grp->packages = alpm_list_add(grp->packages, pkg);
+			db->grpcache = alpm_list_add(db->grpcache, grp);
+		}
+	}
+
+	db->grpcache_loaded = 1;
+	return(0);
+}
+
+void _alpm_db_free_grpcache(pmdb_t *db)
+{
+	alpm_list_t *lg;
+
+	ALPM_LOG_FUNC;
+
+	if(db == NULL || !db->grpcache_loaded) {
+		return;
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "freeing group cache for repository '%s'\n",
+	                        db->treename);
+
+	for(lg = db->grpcache; lg; lg = lg->next) {
+		_alpm_grp_free(lg->data);
+		lg->data = NULL;
+	}
+	FREELIST(db->grpcache);
+	db->grpcache_loaded = 0;
+}
+
+alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db)
+{
+	ALPM_LOG_FUNC;
+
+	if(db == NULL) {
+		return(NULL);
+	}
+
+	if(!db->grpcache_loaded) {
+		_alpm_db_load_grpcache(db);
+	}
+
+	return(db->grpcache);
+}
+
+pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target)
+{
+	alpm_list_t *i;
+
+	ALPM_LOG_FUNC;
+
+	if(db == NULL || target == NULL || strlen(target) == 0) {
+		return(NULL);
+	}
+
+	for(i = _alpm_db_get_grpcache(db); i; i = i->next) {
+		pmgrp_t *info = i->data;
+
+		if(strcmp(info->name, target) == 0) {
+			return(info);
+		}
+	}
+
+	return(NULL);
+}
+
 static int checkdbdir(pmdb_t *db)
 {
 	struct stat buf;

lib/libalpm/cache.c

@@ -1,281 +0,0 @@
-/*
- *  cache.c
- *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
- *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-
-/* libalpm */
-#include "cache.h"
-#include "alpm_list.h"
-#include "log.h"
-#include "alpm.h"
-#include "util.h"
-#include "package.h"
-#include "group.h"
-#include "db.h"
-
-/* Returns a new package cache from db.
- * It frees the cache if it already exists.
- */
-int _alpm_db_load_pkgcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(-1);
-	}
-	_alpm_db_free_pkgcache(db);
-
-	_alpm_log(PM_LOG_DEBUG, "loading package cache for repository '%s'\n",
-			db->treename);
-	if(_alpm_db_populate(db) == -1) {
-		_alpm_log(PM_LOG_DEBUG,
-				"failed to load package cache for repository '%s'\n", db->treename);
-		return(-1);
-	}
-
-	db->pkgcache_loaded = 1;
-	return(0);
-}
-
-void _alpm_db_free_pkgcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->pkgcache_loaded) {
-		return;
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "freeing package cache for repository '%s'\n",
-	                        db->treename);
-
-	alpm_list_free_inner(db->pkgcache, (alpm_list_fn_free)_alpm_pkg_free);
-	alpm_list_free(db->pkgcache);
-	db->pkgcache = NULL;
-	db->pkgcache_loaded = 0;
-
-	_alpm_db_free_grpcache(db);
-}
-
-alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(NULL);
-	}
-
-	if(!db->pkgcache_loaded) {
-		_alpm_db_load_pkgcache(db);
-	}
-
-	/* hmmm, still NULL ?*/
-	if(!db->pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "warning: pkgcache is NULL for db '%s'\n", db->treename);
-	}
-
-	return(db->pkgcache);
-}
-
-/* "duplicate" pkg then add it to pkgcache */
-int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg)
-{
-	pmpkg_t *newpkg;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
-		return(-1);
-	}
-
-	newpkg = _alpm_pkg_dup(pkg);
-	if(newpkg == NULL) {
-		return(-1);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "adding entry '%s' in '%s' cache\n",
-						alpm_pkg_get_name(newpkg), db->treename);
-	db->pkgcache = alpm_list_add_sorted(db->pkgcache, newpkg, _alpm_pkg_cmp);
-
-	_alpm_db_free_grpcache(db);
-
-	return(0);
-}
-
-int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg)
-{
-	void *vdata;
-	pmpkg_t *data;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->pkgcache_loaded || pkg == NULL) {
-		return(-1);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "removing entry '%s' from '%s' cache\n",
-						alpm_pkg_get_name(pkg), db->treename);
-
-	db->pkgcache = alpm_list_remove(db->pkgcache, pkg, _alpm_pkg_cmp, &vdata);
-	data = vdata;
-	if(data == NULL) {
-		/* package not found */
-		_alpm_log(PM_LOG_DEBUG, "cannot remove entry '%s' from '%s' cache: not found\n",
-							alpm_pkg_get_name(pkg), db->treename);
-		return(-1);
-	}
-
-	_alpm_pkg_free(data);
-
-	_alpm_db_free_grpcache(db);
-
-	return(0);
-}
-
-pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(NULL);
-	}
-
-	alpm_list_t *pkgcache = _alpm_db_get_pkgcache(db);
-	if(!pkgcache) {
-		_alpm_log(PM_LOG_DEBUG, "warning: failed to get '%s' from NULL pkgcache\n",
-				target);
-		return(NULL);
-	}
-
-	return(_alpm_pkg_find(pkgcache, target));
-}
-
-/* Returns a new group cache from db.
- */
-int _alpm_db_load_grpcache(pmdb_t *db)
-{
-	alpm_list_t *lp;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(-1);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "loading group cache for repository '%s'\n",
-			db->treename);
-
-	for(lp = _alpm_db_get_pkgcache(db); lp; lp = lp->next) {
-		const alpm_list_t *i;
-		pmpkg_t *pkg = lp->data;
-
-		for(i = alpm_pkg_get_groups(pkg); i; i = i->next) {
-			const char *grpname = i->data;
-			alpm_list_t *j;
-			pmgrp_t *grp = NULL;
-			int found = 0;
-
-			/* first look through the group cache for a group with this name */
-			for(j = db->grpcache; j; j = j->next) {
-				grp = j->data;
-
-				if(strcmp(grp->name, grpname) == 0
-						&& !alpm_list_find_ptr(grp->packages, pkg)) {
-					grp->packages = alpm_list_add(grp->packages, pkg);
-					found = 1;
-					break;
-				}
-			}
-			if(found) {
-				continue;
-			}
-			/* we didn't find the group, so create a new one with this name */
-			grp = _alpm_grp_new(grpname);
-			grp->packages = alpm_list_add(grp->packages, pkg);
-			db->grpcache = alpm_list_add(db->grpcache, grp);
-		}
-	}
-
-	db->grpcache_loaded = 1;
-	return(0);
-}
-
-void _alpm_db_free_grpcache(pmdb_t *db)
-{
-	alpm_list_t *lg;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || !db->grpcache_loaded) {
-		return;
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "freeing group cache for repository '%s'\n",
-	                        db->treename);
-
-	for(lg = db->grpcache; lg; lg = lg->next) {
-		_alpm_grp_free(lg->data);
-		lg->data = NULL;
-	}
-	FREELIST(db->grpcache);
-	db->grpcache_loaded = 0;
-}
-
-alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db)
-{
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		return(NULL);
-	}
-
-	if(!db->grpcache_loaded) {
-		_alpm_db_load_grpcache(db);
-	}
-
-	return(db->grpcache);
-}
-
-pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target)
-{
-	alpm_list_t *i;
-
-	ALPM_LOG_FUNC;
-
-	if(db == NULL || target == NULL || strlen(target) == 0) {
-		return(NULL);
-	}
-
-	for(i = _alpm_db_get_grpcache(db); i; i = i->next) {
-		pmgrp_t *info = i->data;
-
-		if(strcmp(info->name, target) == 0) {
-			return(info);
-		}
-	}
-
-	return(NULL);
-}
-
-/* vim: set ts=2 sw=2 noet: */

lib/libalpm/cache.h

@@ -1,44 +0,0 @@
-/*
- *  cache.h
- *
- *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
- *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef _ALPM_CACHE_H
-#define _ALPM_CACHE_H
-
-#include "db.h"
-#include "alpm_list.h"
-#include "group.h"
-#include "package.h"
-
-/* packages */
-int _alpm_db_load_pkgcache(pmdb_t *db);
-void _alpm_db_free_pkgcache(pmdb_t *db);
-int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg);
-int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg);
-alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db);
-int _alpm_db_ensure_pkgcache(pmdb_t *db, pmdbinfrq_t infolevel);
-pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target);
-/* groups */
-int _alpm_db_load_grpcache(pmdb_t *db);
-void _alpm_db_free_grpcache(pmdb_t *db);
-alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db);
-pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target);
-
-#endif /* _ALPM_CACHE_H */
-
-/* vim: set ts=2 sw=2 noet: */

lib/libalpm/conflict.c

@@ -38,7 +38,6 @@
 #include "trans.h"
 #include "util.h"
 #include "log.h"
-#include "cache.h"
 #include "deps.h"
 
 pmconflict_t *_alpm_conflict_new(const char *package1, const char *package2, const char *reason)

lib/libalpm/db.c

@@ -39,8 +39,8 @@
 #include "log.h"
 #include "util.h"
 #include "handle.h"
-#include "cache.h"
 #include "alpm.h"
+#include "package.h"
 
 /** \addtogroup alpm_databases Database Functions
  * @brief Functions to query and manipulate the database of libalpm

lib/libalpm/db.h

@@ -67,6 +67,21 @@ int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);
 int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
 int _alpm_db_remove(pmdb_t *db, pmpkg_t *info);
 
+/* cache bullshit */
+/* packages */
+int _alpm_db_load_pkgcache(pmdb_t *db);
+void _alpm_db_free_pkgcache(pmdb_t *db);
+int _alpm_db_add_pkgincache(pmdb_t *db, pmpkg_t *pkg);
+int _alpm_db_remove_pkgfromcache(pmdb_t *db, pmpkg_t *pkg);
+alpm_list_t *_alpm_db_get_pkgcache(pmdb_t *db);
+int _alpm_db_ensure_pkgcache(pmdb_t *db, pmdbinfrq_t infolevel);
+pmpkg_t *_alpm_db_get_pkgfromcache(pmdb_t *db, const char *target);
+/* groups */
+int _alpm_db_load_grpcache(pmdb_t *db);
+void _alpm_db_free_grpcache(pmdb_t *db);
+alpm_list_t *_alpm_db_get_grpcache(pmdb_t *db);
+pmgrp_t *_alpm_db_get_grpfromcache(pmdb_t *db, const char *target);
+
 #endif /* _ALPM_DB_H */
 
 /* vim: set ts=2 sw=2 noet: */

lib/libalpm/deps.c

@@ -34,7 +34,6 @@
 #include "graph.h"
 #include "package.h"
 #include "db.h"
-#include "cache.h"
 #include "handle.h"
 
 void _alpm_dep_free(pmdepend_t *dep)

lib/libalpm/package.c

@@ -42,7 +42,6 @@
 #include "log.h"
 #include "util.h"
 #include "db.h"
-#include "cache.h"
 #include "delta.h"
 #include "handle.h"
 #include "deps.h"

lib/libalpm/remove.c

@@ -42,7 +42,6 @@
 #include "backup.h"
 #include "package.h"
 #include "db.h"
-#include "cache.h"
 #include "deps.h"
 #include "handle.h"
 #include "alpm.h"

lib/libalpm/sync.c

@@ -39,7 +39,6 @@
 #include "log.h"
 #include "package.h"
 #include "db.h"
-#include "cache.h"
 #include "deps.h"
 #include "conflict.h"
 #include "trans.h"

lib/libalpm/trans.c

@@ -44,7 +44,6 @@
 #include "sync.h"
 #include "alpm.h"
 #include "deps.h"
-#include "cache.h"
 
 /** \addtogroup alpm_trans Transaction Functions
  * @brief Functions to manipulate libalpm transactions