emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some function from lib/repository* with more meaningful names.

Browse Source 
xbps_unregister_repository() -> xbps_repository_register()
xbps_register_repository() -> xbps_repository_unregister()
xbps_find_deps_in_pkg() -> xbps_repository_find_pkg_deps()
xbps_prepare_pkg() -> xbps_repository_install_pkg()
xbps_find_new_pkg() -> xbps_repository_update_pkg()
xbps_find_new_packages() -> xbps_repository_update_allpkgs()
xbps_get_pkg_props() -> xbps_repository_get_transaction_dict()

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091130110846-5uaqxdhfo0kl0cqd
This commit is contained in:
Juan RP 2009-11-30 12:08:46 +01:00
parent e4cda0e9cc
commit 91aeac4dad
6 changed files with 46 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/xbps-bin/install.c
View File

@ -312,7 +312,7 @@ xbps_exec_transaction(const char *pkgname, bool force, bool update)
* "xbps-bin autoupdate". * "xbps-bin autoupdate".
*/ */
printf("Finding new packages...\n"); printf("Finding new packages...\n");
if ((rv = xbps_find_new_packages()) != 0) { if ((rv = xbps_repository_update_allpkgs()) != 0) {
if (rv == ENOENT) { if (rv == ENOENT) {
printf("No packages currently registered.\n"); printf("No packages currently registered.\n");
return 0; return 0;
@ -331,7 +331,7 @@ xbps_exec_transaction(const char *pkgname, bool force, bool update)
*/ */
printf("Finding new '%s' package...\n", pkgname); printf("Finding new '%s' package...\n", pkgname);
if (pkgd) { if (pkgd) {
rv = xbps_find_new_pkg(pkgname, pkgd); rv = xbps_repository_update_pkg(pkgname, pkgd);
if (rv == EEXIST) { if (rv == EEXIST) {
printf("Package '%s' is up to date.\n", printf("Package '%s' is up to date.\n",
pkgname); pkgname);
@ -363,7 +363,7 @@ xbps_exec_transaction(const char *pkgname, bool force, bool update)
prop_object_release(pkgd); prop_object_release(pkgd);
return rv; return rv;
} }
rv = xbps_prepare_pkg(pkgname); rv = xbps_repository_install_pkg(pkgname);
if (rv != 0 && rv == EAGAIN) { if (rv != 0 && rv == EAGAIN) {
printf("Unable to locate '%s' in " printf("Unable to locate '%s' in "
"repository pool.\n", pkgname); "repository pool.\n", pkgname);
@ -379,7 +379,7 @@ xbps_exec_transaction(const char *pkgname, bool force, bool update)
if (trans == NULL) if (trans == NULL)
goto out; goto out;
trans->dict = xbps_get_pkg_props(); trans->dict = xbps_repository_get_transaction_dict();
if (trans->dict == NULL) { if (trans->dict == NULL) {
printf("error: unexistent props dictionary!\n"); printf("error: unexistent props dictionary!\n");
goto out1; goto out1;

4
bin/xbps-repo/repository.c
View File

@ -134,7 +134,7 @@ unregister_repository(const char *uri)
if (!sanitize_url(idxstr, uri)) if (!sanitize_url(idxstr, uri))
return errno; return errno;
if ((rv = xbps_unregister_repository(idxstr)) != 0) { if ((rv = xbps_repository_unregister(idxstr)) != 0) {
if (rv == ENOENT) if (rv == ENOENT)
printf("Repository '%s' not actually " printf("Repository '%s' not actually "
"registered.\n", idxstr); "registered.\n", idxstr);
@ -182,7 +182,7 @@ register_repository(const char *uri)
if ((rv = pkgindex_verify(plist, idxstr, false)) != 0) if ((rv = pkgindex_verify(plist, idxstr, false)) != 0)
goto out; goto out;
if ((rv = xbps_register_repository(idxstr)) != 0) { if ((rv = xbps_repository_register(idxstr)) != 0) {
printf("ERROR: couldn't register repository (%s)\n", printf("ERROR: couldn't register repository (%s)\n",
strerror(rv)); strerror(rv));
goto out; goto out;

15
include/xbps_api.h
View File

@ -191,17 +191,18 @@ int SYMEXPORT xbps_remove_pkg(const char *, const char *, bool);
int xbps_remove_obsoletes(prop_dictionary_t, prop_dictionary_t); int xbps_remove_obsoletes(prop_dictionary_t, prop_dictionary_t);
/* From lib/repository.c */ /* From lib/repository.c */
int SYMEXPORT xbps_register_repository(const char *); int SYMEXPORT xbps_repository_register(const char *);
int SYMEXPORT xbps_unregister_repository(const char *); int SYMEXPORT xbps_repository_unregister(const char *);
/* From lib/repository_finddeps.c */ /* From lib/repository_finddeps.c */
int SYMEXPORT xbps_find_deps_in_pkg(prop_dictionary_t, prop_dictionary_t); int SYMEXPORT xbps_repository_find_pkg_deps(prop_dictionary_t,
prop_dictionary_t);
/* From lib/repository_findpkg.c */ /* From lib/repository_findpkg.c */
int SYMEXPORT xbps_prepare_pkg(const char *); int SYMEXPORT xbps_repository_install_pkg(const char *);
int SYMEXPORT xbps_find_new_pkg(const char *, prop_dictionary_t); int SYMEXPORT xbps_repository_update_pkg(const char *, prop_dictionary_t);
int SYMEXPORT xbps_find_new_packages(void); int SYMEXPORT xbps_repository_update_allpkgs(void);
prop_dictionary_t SYMEXPORT xbps_get_pkg_props(void); prop_dictionary_t SYMEXPORT xbps_repository_get_transaction_dict(void);
/* From lib/repository_plist.c */ /* From lib/repository_plist.c */
char SYMEXPORT char SYMEXPORT

4
lib/repository.c
View File

@ -31,7 +31,7 @@
#include <xbps_api.h> #include <xbps_api.h>
int SYMEXPORT int SYMEXPORT
xbps_register_repository(const char *uri) xbps_repository_register(const char *uri)
{ {
prop_dictionary_t dict; prop_dictionary_t dict;
prop_array_t array; prop_array_t array;
@ -107,7 +107,7 @@ out:
} }
int SYMEXPORT int SYMEXPORT
xbps_unregister_repository(const char *uri) xbps_repository_unregister(const char *uri)
{ {
prop_dictionary_t dict; prop_dictionary_t dict;
prop_array_t array; prop_array_t array;

2
lib/repository_finddeps.c
View File

@ -237,7 +237,7 @@ out:
} }
int SYMEXPORT int SYMEXPORT
xbps_find_deps_in_pkg(prop_dictionary_t master, prop_dictionary_t pkg) xbps_repository_find_pkg_deps(prop_dictionary_t master, prop_dictionary_t pkg)
{ {
prop_array_t pkg_rdeps, missing_rdeps; prop_array_t pkg_rdeps, missing_rdeps;
struct repository_data *rdata; struct repository_data *rdata;

57
lib/repository_findpkg.c
View File

@ -31,22 +31,22 @@
#include <xbps_api.h> #include <xbps_api.h>
static prop_dictionary_t pkg_props; static prop_dictionary_t trans_dict;
static bool pkg_props_initialized; static bool trans_dict_initialized;
static int set_pkg_state(prop_dictionary_t, const char *); static int set_pkg_state(prop_dictionary_t, const char *);
static int static int
create_pkg_props_dictionary(void) create_transaction_dictionary(void)
{ {
prop_array_t unsorted, missing; prop_array_t unsorted, missing;
int rv = 0; int rv = 0;
if (pkg_props_initialized) if (trans_dict_initialized)
return 0; return 0;
pkg_props = prop_dictionary_create(); trans_dict = prop_dictionary_create();
if (pkg_props == NULL) if (trans_dict == NULL)
return ENOMEM; return ENOMEM;
missing = prop_array_create(); missing = prop_array_create();
@ -61,16 +61,16 @@ create_pkg_props_dictionary(void)
goto fail2; goto fail2;
} }
if (!xbps_add_obj_to_dict(pkg_props, missing, "missing_deps")) { if (!xbps_add_obj_to_dict(trans_dict, missing, "missing_deps")) {
rv = EINVAL; rv = EINVAL;
goto fail3; goto fail3;
} }
if (!xbps_add_obj_to_dict(pkg_props, unsorted, "unsorted_deps")) { if (!xbps_add_obj_to_dict(trans_dict, unsorted, "unsorted_deps")) {
rv = EINVAL; rv = EINVAL;
goto fail3; goto fail3;
} }
pkg_props_initialized = true; trans_dict_initialized = true;
return rv; return rv;
@ -79,22 +79,22 @@ fail3:
fail2: fail2:
prop_object_release(missing); prop_object_release(missing);
fail: fail:
prop_object_release(pkg_props); prop_object_release(trans_dict);
return rv; return rv;
} }
prop_dictionary_t SYMEXPORT prop_dictionary_t SYMEXPORT
xbps_get_pkg_props(void) xbps_repository_get_transaction_dict(void)
{ {
if (pkg_props_initialized == false) if (trans_dict_initialized == false)
return NULL; return NULL;
return pkg_props; return trans_dict;
} }
int SYMEXPORT int SYMEXPORT
xbps_find_new_packages(void) xbps_repository_update_allpkgs(void)
{ {
prop_dictionary_t dict; prop_dictionary_t dict;
prop_object_t obj; prop_object_t obj;
@ -132,7 +132,7 @@ xbps_find_new_packages(void)
rv = errno; rv = errno;
break; break;
} }
rv = xbps_find_new_pkg(pkgname, obj); rv = xbps_repository_update_pkg(pkgname, obj);
if (rv == ENOENT) if (rv == ENOENT)
continue; continue;
else if (rv == EEXIST) { else if (rv == EEXIST) {
@ -155,7 +155,7 @@ out:
} }
int SYMEXPORT int SYMEXPORT
xbps_find_new_pkg(const char *pkgname, prop_dictionary_t instpkg) xbps_repository_update_pkg(const char *pkgname, prop_dictionary_t instpkg)
{ {
prop_dictionary_t pkgrd = NULL; prop_dictionary_t pkgrd = NULL;
prop_array_t unsorted; prop_array_t unsorted;
@ -223,9 +223,9 @@ xbps_find_new_pkg(const char *pkgname, prop_dictionary_t instpkg)
goto out; goto out;
} }
/* /*
* Create master pkg dictionary. * Create the transaction dictionary.
*/ */
if ((rv = create_pkg_props_dictionary()) != 0) if ((rv = create_transaction_dictionary()) != 0)
goto out; goto out;
/* /*
@ -239,14 +239,14 @@ xbps_find_new_pkg(const char *pkgname, prop_dictionary_t instpkg)
/* /*
* Construct the dependency chain for this package. * Construct the dependency chain for this package.
*/ */
if ((rv = xbps_find_deps_in_pkg(pkg_props, pkgrd)) != 0) if ((rv = xbps_repository_find_pkg_deps(trans_dict, pkgrd)) != 0)
goto out; goto out;
/* /*
* Add required package dictionary into the packages * Add required package dictionary into the packages
* dictionary. * dictionary.
*/ */
unsorted = prop_dictionary_get(pkg_props, "unsorted_deps"); unsorted = prop_dictionary_get(trans_dict, "unsorted_deps");
if (unsorted == NULL) { if (unsorted == NULL) {
rv = EINVAL; rv = EINVAL;
goto out; goto out;
@ -298,7 +298,7 @@ set_pkg_state(prop_dictionary_t pkgd, const char *pkgname)
} }
int SYMEXPORT int SYMEXPORT
xbps_prepare_pkg(const char *pkgname) xbps_repository_install_pkg(const char *pkgname)
{ {
prop_dictionary_t origin_pkgrd = NULL, pkgrd = NULL; prop_dictionary_t origin_pkgrd = NULL, pkgrd = NULL;
prop_array_t pkgs_array; prop_array_t pkgs_array;
@ -331,9 +331,9 @@ xbps_prepare_pkg(const char *pkgname)
} }
/* /*
* Create master pkg dictionary. * Create the transaction dictionary.
*/ */
if ((rv = create_pkg_props_dictionary()) != 0) if ((rv = create_transaction_dictionary()) != 0)
goto out; goto out;
/* /*
@ -345,7 +345,7 @@ xbps_prepare_pkg(const char *pkgname)
} }
origin_pkgrd = prop_dictionary_copy(pkgrd); origin_pkgrd = prop_dictionary_copy(pkgrd);
if (!prop_dictionary_set_cstring(pkg_props, "origin", pkgname)) { if (!prop_dictionary_set_cstring(trans_dict, "origin", pkgname)) {
rv = errno; rv = errno;
goto out; goto out;
} }
@ -356,12 +356,13 @@ xbps_prepare_pkg(const char *pkgname)
/* /*
* Construct the dependency chain for this package. * Construct the dependency chain for this package.
*/ */
if ((rv = xbps_find_deps_in_pkg(pkg_props, pkgrd)) != 0) if ((rv = xbps_repository_find_pkg_deps(trans_dict,
pkgrd)) != 0)
goto out; goto out;
/* /*
* Sort the dependency chain for this package. * Sort the dependency chain for this package.
*/ */
if ((rv = xbps_sort_pkg_deps(pkg_props)) != 0) if ((rv = xbps_sort_pkg_deps(trans_dict)) != 0)
goto out; goto out;
} else { } else {
/* /*
@ -373,7 +374,7 @@ xbps_prepare_pkg(const char *pkgname)
rv = errno; rv = errno;
goto out; goto out;
} }
if (!prop_dictionary_set(pkg_props, "packages", if (!prop_dictionary_set(trans_dict, "packages",
pkgs_array)) { pkgs_array)) {
rv = errno; rv = errno;
goto out; goto out;
@ -384,7 +385,7 @@ xbps_prepare_pkg(const char *pkgname)
* Add required package dictionary into the packages * Add required package dictionary into the packages
* dictionary. * dictionary.
*/ */
pkgs_array = prop_dictionary_get(pkg_props, "packages"); pkgs_array = prop_dictionary_get(trans_dict, "packages");
if (pkgs_array == NULL || if (pkgs_array == NULL ||
prop_object_type(pkgs_array) != PROP_TYPE_ARRAY) { prop_object_type(pkgs_array) != PROP_TYPE_ARRAY) {
rv = EINVAL; rv = EINVAL;