From e4cda0e9cc315117e2bf501a7157d58fb2b31cdb Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Nov 2009 11:53:25 +0100 Subject: [PATCH] Rename lib/sync_remote_pkgidx.c to repository_sync_index.c. xbps_sync_repository_pkg_index() renamed to xbps_repository_sync_pkg_index(). --HG-- rename : lib/sync_remote_pkgidx.c => lib/repository_sync_index.c extra : convert_revision : xtraeme%40gmail.com-20091130105325-75rr2xm1zpi8bjwh --- bin/xbps-repo/repository.c | 4 ++-- include/xbps_api.h | 8 ++++---- lib/Makefile | 4 ++-- lib/{sync_remote_pkgidx.c => repository_sync_index.c} | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename lib/{sync_remote_pkgidx.c => repository_sync_index.c} (98%) diff --git a/bin/xbps-repo/repository.c b/bin/xbps-repo/repository.c index 41f8d4bd..d6ecf88d 100644 --- a/bin/xbps-repo/repository.c +++ b/bin/xbps-repo/repository.c @@ -157,7 +157,7 @@ register_repository(const char *uri) return errno; printf("Fetching remote package index at %s...\n", uri); - rv = xbps_sync_repository_pkg_index(idxstr); + rv = xbps_repository_sync_pkg_index(idxstr); if (rv == -1) { printf("Error: could not fetch pkg index file: %s.\n", xbps_fetch_error_string()); @@ -277,7 +277,7 @@ repository_sync(void) continue; printf("Syncing package index from: %s\n", rd->rd_uri); - rv = xbps_sync_repository_pkg_index(rd->rd_uri); + rv = xbps_repository_sync_pkg_index(rd->rd_uri); if (rv == -1) { printf("Failed! returned: %s\n", xbps_fetch_error_string()); diff --git a/include/xbps_api.h b/include/xbps_api.h index 22a8ddcc..9d708981 100644 --- a/include/xbps_api.h +++ b/include/xbps_api.h @@ -222,6 +222,10 @@ SYMEXPORT SIMPLEQ_HEAD(, repository_data) repodata_queue; int SYMEXPORT xbps_repository_pool_init(void); void SYMEXPORT xbps_repository_pool_release(void); +/* From lib/repository_sync_index.c */ +int SYMEXPORT xbps_repository_sync_pkg_index(const char *); +char SYMEXPORT *xbps_get_remote_repo_string(const char *); + /* From lib/requiredby.c */ int SYMEXPORT xbps_requiredby_pkg_add(prop_array_t, prop_dictionary_t); int SYMEXPORT xbps_requiredby_pkg_remove(const char *); @@ -243,10 +247,6 @@ int SYMEXPORT xbps_get_pkg_state_dictionary(prop_dictionary_t, pkg_state_t *); int SYMEXPORT xbps_set_pkg_state_installed(const char *, pkg_state_t); int SYMEXPORT xbps_set_pkg_state_dictionary(prop_dictionary_t, pkg_state_t); -/* From lib/sync_remote_pkgidx.c */ -int SYMEXPORT xbps_sync_repository_pkg_index(const char *); -char SYMEXPORT *xbps_get_remote_repo_string(const char *); - /* From lib/unpack.c */ int SYMEXPORT xbps_unpack_binary_pkg(prop_dictionary_t, bool); diff --git a/lib/Makefile b/lib/Makefile index eb8d3ae7..23652c9d 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -18,8 +18,8 @@ OBJS += configure.o config_files.o cmpver.o download.o fexec.o OBJS += humanize_number.o orphans.o plist.o purge.o register.o OBJS += regpkgs_dictionary.o remove.o remove_obsoletes.o repository.o OBJS += repository_finddeps.o repository_findpkg.o repository_plist.o -OBJS += repository_pool.o requiredby.o sha256.o sortdeps.o state.o -OBJS += sync_remote_pkgidx.o unpack.o util.o pkgmatch.o mkpath.o +OBJS += repository_pool.o repository_sync_index.o requiredby.o sha256.o +OBJS += sortdeps.o state.o unpack.o util.o pkgmatch.o mkpath.o .PHONY: all all: libfetch libxbps.so libxbps.a diff --git a/lib/sync_remote_pkgidx.c b/lib/repository_sync_index.c similarity index 98% rename from lib/sync_remote_pkgidx.c rename to lib/repository_sync_index.c index 08bd007e..01387eea 100644 --- a/lib/sync_remote_pkgidx.c +++ b/lib/repository_sync_index.c @@ -71,7 +71,7 @@ xbps_get_remote_repo_string(const char *uri) * size and/or mtime match) and 1 if downloaded successfully. */ int SYMEXPORT -xbps_sync_repository_pkg_index(const char *uri) +xbps_repository_sync_pkg_index(const char *uri) { struct url *url = NULL; struct utsname un;