diff --git a/bin/xbps-bin/defs.h b/bin/xbps-bin/defs.h index ec25792f..c1047d0a 100644 --- a/bin/xbps-bin/defs.h +++ b/bin/xbps-bin/defs.h @@ -26,10 +26,6 @@ #ifndef _XBPS_BIN_DEFS_H_ #define _XBPS_BIN_DEFS_H_ -#ifndef __UNCONST -#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) -#endif - #include #include @@ -100,7 +96,6 @@ void unpack_progress_cb(const struct xbps_unpack_cb_data *, void *); int show_pkg_files(prop_dictionary_t); void show_pkg_info(prop_dictionary_t); void show_pkg_info_one(prop_dictionary_t, const char *); -int list_strings_in_array(prop_object_t, void *, bool *); int list_strings_sep_in_array(prop_object_t, void *, bool *); size_t find_longest_pkgver(prop_object_t); void print_package_line(const char *, bool); diff --git a/bin/xbps-bin/util.c b/bin/xbps-bin/util.c index 277f9476..b953e08f 100644 --- a/bin/xbps-bin/util.c +++ b/bin/xbps-bin/util.c @@ -159,6 +159,7 @@ show_pkg_files(prop_dictionary_t filesd) printf("\n"); } } + prop_object_release(allkeys); return 0; } @@ -193,17 +194,6 @@ find_longest_pkgver(prop_object_t o) return len; } -int -list_strings_in_array(prop_object_t obj, void *arg, bool *loop_done) -{ - (void)arg; - (void)loop_done; - - print_package_line(prop_string_cstring_nocopy(obj), false); - - return 0; -} - int list_strings_sep_in_array(prop_object_t obj, void *arg, bool *loop_done) { diff --git a/bin/xbps-repo/defs.h b/bin/xbps-repo/defs.h index 95851998..bcbd906a 100644 --- a/bin/xbps-repo/defs.h +++ b/bin/xbps-repo/defs.h @@ -26,10 +26,6 @@ #ifndef _XBPS_REPO_DEFS_H_ #define _XBPS_REPO_DEFS_H_ -#ifndef __UNCONST -#define __UNCONST(a) ((void *)(unsigned long)(const void *)(a)) -#endif - #include struct repo_search_data { @@ -57,5 +53,4 @@ int show_pkg_info_from_repolist(const char *, const char *); int show_pkg_deps_from_repolist(const char *); int show_pkg_namedesc(prop_object_t, void *, bool *); - #endif /* !_XBPS_REPO_DEFS_H_ */