Fix all warnings found by clang analyzer as reported by ojab in issue 3.

This commit is contained in:
Juan RP 2011-02-03 17:49:43 +01:00
parent 0a26497b50
commit 097b50b3c2
6 changed files with 5 additions and 7 deletions

View File

@ -254,7 +254,6 @@ xbps_check_pkg_integrity(const char *pkgname)
}
rv = xbps_check_is_installed_pkg_by_pattern(reqpkg);
if (rv <= 0) {
rv = ENOENT;
printf("%s: dependency not satisfied: %s\n",
pkgname, reqpkg);
}

View File

@ -158,7 +158,7 @@ main(int argc, char **argv)
bool yes, purge, with_debug, force_rm_with_deps, recursive_rm;
bool show_download_pkglist_url = false;
i = c = flags = rv = 0;
flags = rv = 0;
yes = purge = force_rm_with_deps = recursive_rm = with_debug = false;
while ((c = getopt(argc, argv, "VcdDFfpRr:vy")) != -1) {

View File

@ -258,7 +258,6 @@ parse_array_in_pkg_dictionary(FILE *f, prop_dictionary_t plistd,
keyobj = prop_dictionary_get_keysym(plistd, dksym);
keyname = strip_dashes_from_key(tmpkeyname);
optnodetmp = "";
optnode = NULL;
fprintf(f, " main -> %s [label=\"%s\"];\n",

View File

@ -163,7 +163,7 @@ unpack_archive(prop_dictionary_t pkg_repod,
void (*progress_cb)(void *),
struct xbps_unpack_progress_data *xupd)
{
prop_dictionary_t propsd, filesd, old_filesd;
prop_dictionary_t propsd = NULL, filesd = NULL, old_filesd = NULL;
prop_array_t array;
struct archive_entry *entry;
size_t nmetadata = 0, entry_idx = 0;

View File

@ -76,7 +76,7 @@ store_dependency(prop_dictionary_t transd, prop_dictionary_t repo_pkgd)
* Overwrite package state in dictionary if it was unpacked
* previously.
*/
if ((rv = xbps_get_pkg_state_installed(pkgname, &state)) == 0) {
if (xbps_get_pkg_state_installed(pkgname, &state) == 0) {
if ((rv = xbps_set_pkg_state_dictionary(dict, state)) != 0) {
prop_object_release(dict);
return rv;
@ -216,7 +216,7 @@ find_repo_deps(prop_dictionary_t transd, /* transaction dictionary */
* current package.
*/
while ((obj = prop_object_iterator_next(iter)) != NULL) {
tmpd = curpkgd = NULL;
curpkgd = NULL;
reqpkg = prop_string_cstring_nocopy(obj);
if (reqpkg == NULL) {
rv = EINVAL;

View File

@ -93,7 +93,7 @@ repository_find_pkg(const char *pattern, const char *reason)
assert(pattern != NULL);
assert(reason != NULL);
success = install = bypattern = bestpkg = false;
install = bypattern = false;
if (strcmp(reason, "install") == 0) {
/* install */