diff options
author | Dan McGee <dan@archlinux.org> | 2011-06-03 18:54:58 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-06-03 18:54:58 +0200 |
commit | 2102d1a2eb6cb9db674fd76aa7aa3192befad733 (patch) | |
tree | 88bd44b015e91255e571fbb61a5624c0a107f453 /lib/libalpm/conflict.c | |
parent | 78cbc045c129ca7767b13127e1e17c400b112770 (diff) | |
download | pacman-2102d1a2eb6cb9db674fd76aa7aa3192befad733.tar.gz pacman-2102d1a2eb6cb9db674fd76aa7aa3192befad733.tar.xz |
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 <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/conflict.c')
-rw-r--r-- | lib/libalpm/conflict.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 995c6cb7..12a68cfe 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -508,7 +508,6 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans, const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); return conflict->package1; @@ -517,7 +516,6 @@ const char SYMEXPORT *alpm_conflict_get_package1(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); return conflict->package2; @@ -526,7 +524,6 @@ const char SYMEXPORT *alpm_conflict_get_package2(pmconflict_t *conflict) const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); return conflict->reason; @@ -535,7 +532,6 @@ const char SYMEXPORT *alpm_conflict_get_reason(pmconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); return conflict->target; @@ -544,7 +540,6 @@ const char SYMEXPORT *alpm_fileconflict_get_target(pmfileconflict_t *conflict) pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return -1); ASSERT(conflict != NULL, return -1); return conflict->type; @@ -553,7 +548,6 @@ pmfileconflicttype_t SYMEXPORT alpm_fileconflict_get_type(pmfileconflict_t *conf const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); return conflict->file; @@ -562,7 +556,6 @@ const char SYMEXPORT *alpm_fileconflict_get_file(pmfileconflict_t *conflict) const char SYMEXPORT *alpm_fileconflict_get_ctarget(pmfileconflict_t *conflict) { /* Sanity checks */ - ASSERT(handle != NULL, return NULL); ASSERT(conflict != NULL, return NULL); return conflict->ctarget; |