Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=60b4cb87d0db4d9e028fcf2a926baca0db7c3b10
commit 60b4cb87d0db4d9e028fcf2a926baca0db7c3b10 Author: Michel Hermier <[email protected]> Date: Mon May 12 08:28:55 2014 +0200 libpacman: Relax __pmtrans_t::prepare data argument check, we support NULL data since a while it seems. diff --git a/lib/libpacman/trans.cpp b/lib/libpacman/trans.cpp index 1740cac..a13d0c9 100644 --- a/lib/libpacman/trans.cpp +++ b/lib/libpacman/trans.cpp @@ -890,10 +890,11 @@ int __pmtrans_t::prepare(pmlist_t **data) int ret = 0; /* Sanity checks */ - ASSERT(data != NULL, RET_ERR(PM_ERR_WRONG_ARGS, -1)); ASSERT((db_local = handle->db_local) != NULL, RET_ERR(PM_ERR_DB_NULL, -1)); - *data = NULL; + if(data) { + *data = NULL; + } /* If there's nothing to do, return without complaining */ if(_pacman_list_empty(packages) && @@ -904,11 +905,6 @@ int __pmtrans_t::prepare(pmlist_t **data) _pacman_trans_compute_triggers(this); if(type == PM_TRANS_TYPE_SYNC) { - - if(data) { - *data = NULL; - } - for(i = syncpkgs; i; i = i->next) { pmsyncpkg_t *ps = i->data; list = _pacman_list_add(list, ps->pkg); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
