From 2102d1a2eb6cb9db674fd76aa7aa3192befad733 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 3 Jun 2011 11:54:58 -0500 Subject: Remove unnecessary handle != NULL asserts These are simple accessor functions for a struct; the handle never even comes into play when calling these functions. Signed-off-by: Dan McGee --- lib/libalpm/db.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib/libalpm/db.c') diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 94173a26..a1587230 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -230,7 +230,6 @@ int SYMEXPORT alpm_db_set_pgp_verify(pmdb_t *db, pgp_verify_t verify) const char SYMEXPORT *alpm_db_get_name(const pmdb_t *db) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); return db->treename; @@ -242,7 +241,6 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) char *url; /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); ASSERT(db->servers != NULL, return NULL); @@ -256,7 +254,6 @@ const char SYMEXPORT *alpm_db_get_url(const pmdb_t *db) pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); ASSERT(name != NULL && strlen(name) != 0, return NULL); @@ -267,7 +264,6 @@ pmpkg_t SYMEXPORT *alpm_db_get_pkg(pmdb_t *db, const char *name) alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); return _alpm_db_get_pkgcache(db); @@ -277,7 +273,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(pmdb_t *db) pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); ASSERT(name != NULL && strlen(name) != 0, return NULL); @@ -288,7 +283,6 @@ pmgrp_t SYMEXPORT *alpm_db_readgrp(pmdb_t *db, const char *name) alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); return _alpm_db_get_grpcache(db); @@ -298,7 +292,6 @@ alpm_list_t SYMEXPORT *alpm_db_get_grpcache(pmdb_t *db) alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(db != NULL, return NULL); return _alpm_db_search(db, needles); @@ -308,7 +301,6 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles) int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t reason) { /* Sanity checks */ - ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1)); ASSERT(db != NULL && name != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); pmpkg_t *pkg = _alpm_db_get_pkgfromcache(db, name); -- cgit v1.2.3-24-g4f1b