Some dead stores and build fixes reported by LLVM 2.9.
This commit is contained in:
parent
6a91c2894e
commit
d9eb0341cd
@ -39,7 +39,6 @@
|
|||||||
int HIDDEN
|
int HIDDEN
|
||||||
xbps_remove_obsoletes(prop_dictionary_t oldd, prop_dictionary_t newd)
|
xbps_remove_obsoletes(prop_dictionary_t oldd, prop_dictionary_t newd)
|
||||||
{
|
{
|
||||||
const struct xbps_handle *xhp;
|
|
||||||
prop_object_iterator_t iter, iter2;
|
prop_object_iterator_t iter, iter2;
|
||||||
prop_object_t obj, obj2;
|
prop_object_t obj, obj2;
|
||||||
prop_string_t oldstr, newstr;
|
prop_string_t oldstr, newstr;
|
||||||
@ -52,7 +51,6 @@ xbps_remove_obsoletes(prop_dictionary_t oldd, prop_dictionary_t newd)
|
|||||||
|
|
||||||
assert(oldd != NULL);
|
assert(oldd != NULL);
|
||||||
assert(newd != NULL);
|
assert(newd != NULL);
|
||||||
xhp = xbps_handle_get();
|
|
||||||
|
|
||||||
again:
|
again:
|
||||||
iter = xbps_get_array_iter_from_dict(oldd, array_str);
|
iter = xbps_get_array_iter_from_dict(oldd, array_str);
|
||||||
|
@ -81,7 +81,6 @@ store_dependency(prop_dictionary_t transd, prop_dictionary_t repo_pkgd)
|
|||||||
prop_object_release(dict);
|
prop_object_release(dict);
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
rv = 0;
|
|
||||||
state = XBPS_PKG_STATE_NOT_INSTALLED;
|
state = XBPS_PKG_STATE_NOT_INSTALLED;
|
||||||
}
|
}
|
||||||
if ((rv = xbps_set_pkg_state_dictionary(dict, state)) != 0) {
|
if ((rv = xbps_set_pkg_state_dictionary(dict, state)) != 0) {
|
||||||
|
@ -142,7 +142,6 @@ repository_find_pkg(const char *pattern, const char *reason)
|
|||||||
if (rv != ENOENT)
|
if (rv != ENOENT)
|
||||||
goto out;
|
goto out;
|
||||||
/* Package not installed, don't error out */
|
/* Package not installed, don't error out */
|
||||||
rv = 0;
|
|
||||||
state = XBPS_PKG_STATE_NOT_INSTALLED;
|
state = XBPS_PKG_STATE_NOT_INSTALLED;
|
||||||
}
|
}
|
||||||
if ((rv = xbps_set_pkg_state_dictionary(origin_pkgrd, state)) != 0)
|
if ((rv = xbps_set_pkg_state_dictionary(origin_pkgrd, state)) != 0)
|
||||||
|
@ -25,6 +25,9 @@
|
|||||||
|
|
||||||
#ifdef HAVE_VASPRINTF
|
#ifdef HAVE_VASPRINTF
|
||||||
# define _GNU_SOURCE /* for vasprintf(3) */
|
# define _GNU_SOURCE /* for vasprintf(3) */
|
||||||
|
# ifdef _XOPEN_SOURCE
|
||||||
|
# undef _XOPEN_SOURCE
|
||||||
|
# endif
|
||||||
# include <stdio.h>
|
# include <stdio.h>
|
||||||
# undef _GNU_SOURCE
|
# undef _GNU_SOURCE
|
||||||
#else
|
#else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user