From dfb7e2a687d694db0d094918d4c8ac4bf59c30b0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 5 Feb 2009 15:31:54 +0100 Subject: [PATCH] xbps-repo: there's no need to prefix local funcs with xbps_ anymore. --HG-- extra : convert_revision : d8a2402697ca5709c5ca4e94d94ab4df6b97c818 --- bin/xbps-repo/main.c | 8 ++++---- bin/xbps-repo/util.c | 6 +++--- bin/xbps-repo/util.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/xbps-repo/main.c b/bin/xbps-repo/main.c index d4b0930a2fc..164ff9245f2 100644 --- a/bin/xbps-repo/main.c +++ b/bin/xbps-repo/main.c @@ -56,7 +56,7 @@ usage(void) " Available actions:\n" " add, list, remove, search, show\n" " Actions with arguments:\n" - " add\t\n" + " add\t\t\n" " remove\t\n" " search\t\n" " show\t\n" @@ -251,7 +251,7 @@ main(int argc, char **argv) dict = getrepolist_dict(root); (void)xbps_callback_array_iter_in_dict(dict, - "repository-list", xbps_list_strings_in_array, NULL); + "repository-list", list_strings_in_array, NULL); prop_object_release(dict); free(plist); @@ -281,7 +281,7 @@ main(int argc, char **argv) dict = getrepolist_dict(root); (void)xbps_callback_array_iter_in_dict(dict, - "repository-list", xbps_search_string_in_pkgs, argv[1]); + "repository-list", search_string_in_pkgs, argv[1]); prop_object_release(dict); free(plist); @@ -292,7 +292,7 @@ main(int argc, char **argv) dict = getrepolist_dict(root); if (xbps_callback_array_iter_in_dict(dict, "repository-list", - xbps_show_pkg_info_from_repolist, argv[1]) != 0) { + show_pkg_info_from_repolist, argv[1]) != 0) { prop_object_release(dict); free(plist); printf("ERROR: unable to locate package '%s'.\n", diff --git a/bin/xbps-repo/util.c b/bin/xbps-repo/util.c index d75bffa605a..1a6f38e0ad4 100644 --- a/bin/xbps-repo/util.c +++ b/bin/xbps-repo/util.c @@ -121,7 +121,7 @@ show_pkg_info(prop_dictionary_t dict) } int -xbps_search_string_in_pkgs(prop_object_t obj, void *arg, bool *loop_done) +search_string_in_pkgs(prop_object_t obj, void *arg, bool *loop_done) { prop_dictionary_t dict; const char *repofile; @@ -153,7 +153,7 @@ xbps_search_string_in_pkgs(prop_object_t obj, void *arg, bool *loop_done) } int -xbps_show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done) +show_pkg_info_from_repolist(prop_object_t obj, void *arg, bool *loop_done) { prop_dictionary_t dict, pkgdict; prop_string_t oloc; @@ -249,7 +249,7 @@ list_strings_in_array2(prop_object_t obj, void *arg, bool *loop_done) } int -xbps_list_strings_in_array(prop_object_t obj, void *arg, bool *loop_done) +list_strings_in_array(prop_object_t obj, void *arg, bool *loop_done) { assert(prop_object_type(obj) == PROP_TYPE_STRING); diff --git a/bin/xbps-repo/util.h b/bin/xbps-repo/util.h index 7a838b96cfd..eaac833934b 100644 --- a/bin/xbps-repo/util.h +++ b/bin/xbps-repo/util.h @@ -23,6 +23,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -int xbps_search_string_in_pkgs(prop_object_t, void *, bool *); -int xbps_show_pkg_info_from_repolist(prop_object_t, void *, bool *); -int xbps_list_strings_in_array(prop_object_t, void *, bool *); +int search_string_in_pkgs(prop_object_t, void *, bool *); +int show_pkg_info_from_repolist(prop_object_t, void *, bool *); +int list_strings_in_array(prop_object_t, void *, bool *);