1 files changed, 34 insertions, 94 deletions

diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index d5edf34c..3a0887d0 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -31,10 +31,6 @@
 #include <time.h>
 #include <limits.h> /* PATH_MAX */
 
-/* libarchive */
-#include <archive.h>
-#include <archive_entry.h>
-
 /* libalpm */
 #include "db.h"
 #include "alpm_list.h"
@@ -43,16 +39,10 @@
 #include "alpm.h"
 #include "handle.h"
 #include "package.h"
-#include "group.h"
 #include "deps.h"
-#include "dload.h"
-
 
 #define LAZY_LOAD(info, errret) \
 	do { \
-		ALPM_LOG_FUNC; \
-		ASSERT(handle != NULL, return(errret)); \
-		ASSERT(pkg != NULL, return(errret)); \
 		if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \
 			_alpm_local_db_read(pkg->origin_data.db, pkg, info); \
 		} \
@@ -71,18 +61,6 @@ static const char *_cache_get_filename(pmpkg_t *pkg)
 	return pkg->filename;
 }
 
-static const char *_cache_get_name(pmpkg_t *pkg)
-{
-	ASSERT(pkg != NULL, return(NULL));
-	return pkg->name;
-}
-
-static const char *_cache_get_version(pmpkg_t *pkg)
-{
-	ASSERT(pkg != NULL, return(NULL));
-	return pkg->version;
-}
-
 static const char *_cache_get_desc(pmpkg_t *pkg)
 {
 	LAZY_LOAD(INFRQ_DESC, NULL);
@@ -157,12 +135,6 @@ static alpm_list_t *_cache_get_groups(pmpkg_t *pkg)
 
 static int _cache_has_scriptlet(pmpkg_t *pkg)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(-1));
-	ASSERT(pkg != NULL, return(-1));
-
 	if(!(pkg->infolevel & INFRQ_SCRIPTLET)) {
 		_alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_SCRIPTLET);
 	}
@@ -200,19 +172,13 @@ static alpm_list_t *_cache_get_replaces(pmpkg_t *pkg)
 }
 
 /* local packages can not have deltas */
-static alpm_list_t *_cache_get_deltas(pmpkg_t *pkg)
+static alpm_list_t *_cache_get_deltas(pmpkg_t UNUSED *pkg)
 {
 	return NULL;
 }
 
 static alpm_list_t *_cache_get_files(pmpkg_t *pkg)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(pkg != NULL, return(NULL));
-
 	if(pkg->origin == PKG_FROM_LOCALDB
 		 && !(pkg->infolevel & INFRQ_FILES)) {
 		_alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_FILES);
@@ -222,12 +188,6 @@ static alpm_list_t *_cache_get_files(pmpkg_t *pkg)
 
 static alpm_list_t *_cache_get_backup(pmpkg_t *pkg)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(pkg != NULL, return(NULL));
-
 	if(pkg->origin == PKG_FROM_LOCALDB
 		 && !(pkg->infolevel & INFRQ_FILES)) {
 		_alpm_local_db_read(pkg->origin_data.db, pkg, INFRQ_FILES);
@@ -243,12 +203,6 @@ static alpm_list_t *_cache_get_backup(pmpkg_t *pkg)
  */
 static void *_cache_changelog_open(pmpkg_t *pkg)
 {
-	ALPM_LOG_FUNC;
-
-	/* Sanity checks */
-	ASSERT(handle != NULL, return(NULL));
-	ASSERT(pkg != NULL, return(NULL));
-
 	char clfile[PATH_MAX];
 	snprintf(clfile, PATH_MAX, "%s/%s/%s-%s/changelog",
 			alpm_option_get_dbpath(),
@@ -268,18 +222,11 @@ static void *_cache_changelog_open(pmpkg_t *pkg)
  * @return the number of characters read, or 0 if there is no more data
  */
 static size_t _cache_changelog_read(void *ptr, size_t size,
-		const pmpkg_t *pkg, const void *fp)
+		const pmpkg_t UNUSED *pkg, const void *fp)
 {
-	return ( fread(ptr, 1, size, (FILE*)fp) );
+	return fread(ptr, 1, size, (FILE *)fp);
 }
 
-/*
-static int _cache_changelog_feof(const pmpkg_t *pkg, void *fp)
-{
-	return( feof((FILE*)fp) );
-}
-*/
-
 /**
  * Close a package changelog for reading. Similar to fclose in functionality,
  * except that the 'file stream' is from the database.
@@ -287,9 +234,9 @@ static int _cache_changelog_feof(const pmpkg_t *pkg, void *fp)
  * @param fp a 'file stream' to the package changelog
  * @return whether closing the package changelog stream was successful
  */
-static int _cache_changelog_close(const pmpkg_t *pkg, void *fp)
+static int _cache_changelog_close(const pmpkg_t UNUSED *pkg, void *fp)
 {
-	return( fclose((FILE*)fp) );
+	return fclose((FILE *)fp);
 }
 
 
@@ -299,8 +246,6 @@ static int _cache_changelog_close(const pmpkg_t *pkg, void *fp)
  */
 static struct pkg_operations local_pkg_ops = {
 	.get_filename    = _cache_get_filename,
-	.get_name        = _cache_get_name,
-	.get_version     = _cache_get_version,
 	.get_desc        = _cache_get_desc,
 	.get_url         = _cache_get_url,
 	.get_builddate   = _cache_get_builddate,
@@ -345,14 +290,14 @@ static int checkdbdir(pmdb_t *db)
 			RET_ERR(PM_ERR_SYSTEM, -1);
 		}
 	}
-	return(0);
+	return 0;
 }
 
 static int is_dir(const char *path, struct dirent *entry)
 {
 #ifdef HAVE_STRUCT_DIRENT_D_TYPE
 	if(entry->d_type != DT_UNKNOWN) {
-		return(entry->d_type == DT_DIR);
+		return (entry->d_type == DT_DIR);
 	}
 #endif
 	{
@@ -361,12 +306,12 @@ static int is_dir(const char *path, struct dirent *entry)
 
 		snprintf(buffer, PATH_MAX, "%s/%s", path, entry->d_name);
 
-		if (!stat(buffer, &sbuf)) {
-			return(S_ISDIR(sbuf.st_mode));
+		if(!stat(buffer, &sbuf)) {
+			return S_ISDIR(sbuf.st_mode);
 		}
 	}
 
-	return(0);
+	return 0;
 }
 
 static int local_db_populate(pmdb_t *db)
@@ -378,8 +323,6 @@ static int local_db_populate(pmdb_t *db)
 	const char *dbpath;
 	DIR *dbdir;
 
-	ALPM_LOG_FUNC;
-
 	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
 
 	dbpath = _alpm_db_path(db);
@@ -391,7 +334,7 @@ static int local_db_populate(pmdb_t *db)
 	if(dbdir == NULL) {
 		if(errno == ENOENT) {
 			/* no database existing yet is not an error */
-			return(0);
+			return 0;
 		}
 		RET_ERR(PM_ERR_DB_OPEN, -1);
 	}
@@ -458,6 +401,7 @@ static int local_db_populate(pmdb_t *db)
 		pkg->origin = PKG_FROM_LOCALDB;
 		pkg->origin_data.db = db;
 		pkg->ops = &local_pkg_ops;
+		pkg->handle = db->handle;
 
 		/* explicitly read with only 'BASE' data, accessors will handle the rest */
 		if(_alpm_local_db_read(db, pkg, INFRQ_BASE) == -1) {
@@ -467,7 +411,7 @@ static int local_db_populate(pmdb_t *db)
 		}
 
 		/* add to the collection */
-		_alpm_log(PM_LOG_DEBUG, "adding '%s' to package cache for db '%s'\n",
+		_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
 				pkg->name, db->treename);
 		db->pkgcache = _alpm_pkghash_add(db->pkgcache, pkg);
 		count++;
@@ -477,7 +421,10 @@ static int local_db_populate(pmdb_t *db)
 	if(count > 0) {
 		db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp);
 	}
-	return(count);
+	_alpm_log(PM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n",
+			count, db->treename);
+
+	return count;
 }
 
 /* Note: the return value must be freed by the caller */
@@ -491,7 +438,7 @@ static char *get_pkgpath(pmdb_t *db, pmpkg_t *info)
 	len = strlen(dbpath) + strlen(info->name) + strlen(info->version) + 3;
 	MALLOC(pkgpath, len, RET_ERR(PM_ERR_MEMORY, NULL));
 	sprintf(pkgpath, "%s%s-%s/", dbpath, info->name, info->version);
-	return(pkgpath);
+	return pkgpath;
 }
 
 
@@ -502,22 +449,20 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	char line[1024];
 	char *pkgpath = NULL;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL) {
 		RET_ERR(PM_ERR_DB_NULL, -1);
 	}
 
 	if(info == NULL || info->name == NULL || info->version == NULL) {
 		_alpm_log(PM_LOG_DEBUG, "invalid package entry provided to _alpm_local_db_read, skipping\n");
-		return(-1);
+		return -1;
 	}
 
 	if(info->origin != PKG_FROM_LOCALDB) {
 		_alpm_log(PM_LOG_DEBUG,
 				"request to read info for a non-local package '%s', skipping...\n",
 				info->name);
-		return(-1);
+		return -1;
 	}
 
 	/* bitmask logic here:
@@ -527,7 +472,7 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	 * == to inforeq? nope, we need to load more info. */
 	if((info->infolevel & inforeq) == inforeq) {
 		/* already loaded all of this info, do nothing */
-		return(0);
+		return 0;
 	}
 	_alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n",
 			info->name, inforeq);
@@ -707,14 +652,14 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	info->infolevel |= inforeq;
 
 	free(pkgpath);
-	return(0);
+	return 0;
 
 error:
 	free(pkgpath);
 	if(fp) {
 		fclose(fp);
 	}
-	return(-1);
+	return -1;
 }
 
 int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info)
@@ -724,7 +669,7 @@ int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info)
 	char *pkgpath = NULL;
 
 	if(checkdbdir(db) != 0) {
-		return(-1);
+		return -1;
 	}
 
 	oldmask = umask(0000);
@@ -738,7 +683,7 @@ int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info)
 	free(pkgpath);
 	umask(oldmask);
 
-	return(retval);
+	return retval;
 }
 
 int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
@@ -750,10 +695,8 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	int retval = 0;
 	char *pkgpath = NULL;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || info == NULL) {
-		return(-1);
+		return -1;
 	}
 
 	pkgpath = get_pkgpath(db, info);
@@ -762,7 +705,7 @@ int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 	oldmask = umask(0022);
 
 	if(strcmp(db->treename, "local") != 0) {
-		return(-1);
+		return -1;
 	}
 
 	/* DESC */
@@ -905,7 +848,7 @@ cleanup:
 		fclose(fp);
 	}
 
-	return(retval);
+	return retval;
 }
 
 int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info)
@@ -913,8 +856,6 @@ int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info)
 	int ret = 0;
 	char *pkgpath = NULL;
 
-	ALPM_LOG_FUNC;
-
 	if(db == NULL || info == NULL) {
 		RET_ERR(PM_ERR_DB_NULL, -1);
 	}
@@ -926,7 +867,7 @@ int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info)
 	if(ret != 0) {
 		ret = -1;
 	}
-	return(ret);
+	return ret;
 }
 
 static int local_db_version(pmdb_t *db)
@@ -978,7 +919,7 @@ done:
 	}
 
 	_alpm_log(PM_LOG_DEBUG, "local database version %d\n", version);
-	return(version);
+	return version;
 }
 
 struct db_operations local_db_ops = {
@@ -987,22 +928,21 @@ struct db_operations local_db_ops = {
 	.version          = local_db_version,
 };
 
-pmdb_t *_alpm_db_register_local(void)
+pmdb_t *_alpm_db_register_local(pmhandle_t *handle)
 {
 	pmdb_t *db;
 
-	ALPM_LOG_FUNC;
-
 	_alpm_log(PM_LOG_DEBUG, "registering local database\n");
 
 	db = _alpm_db_new("local", 1);
 	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_CREATE, NULL);
+		return NULL;
 	}
 	db->ops = &local_db_ops;
+	db->handle = handle;
 
 	handle->db_local = db;
-	return(db);
+	return db;
 }
 
 /* vim: set ts=2 sw=2 noet: */