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

Make xbps_find_virtualpkg_conf_xxx private again, unused in test suite now.

Browse Source
This commit is contained in:
Juan RP 2012-03-13 11:37:50 +01:00
parent eea183bef4
commit e698acf440
3 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/xbps_api.h
View File

@ -56,7 +56,7 @@
*/
#define XBPS_PKGINDEX_VERSION "1.4"
#define XBPS_API_VERSION "20120313"
#define XBPS_API_VERSION "20120313-1"
#define XBPS_VERSION "0.15"
/**
@ -1097,41 +1097,6 @@ prop_dictionary_t xbps_find_virtualpkg_in_array_by_name(prop_array_t array,
prop_dictionary_t xbps_find_virtualpkg_in_array_by_pattern(prop_array_t array,
const char *pattern);
/**
* Finds a package dictionary in a proplib array by matching a pkgname
* in \a name as set by the virtual package settings in xbps.conf.
*
* @param[in] array The proplib array to search on.
* @param[in] name The virtual package name to match.
*
* @return The package dictionary on match, otherwise NULL is returned.
*/
prop_dictionary_t xbps_find_virtualpkg_conf_in_array_by_name(prop_array_t array,
const char *name);
/**
* Finds a package dictionary in a proplib array by matching a pkgpattern
* in \a pattern as set by the virtual package settings in xbps.conf.
*
* @param[in] array The proplib array to search on.
* @param[in] pattern The virtual package pattern to match, i.e
* `foo>=0' or `foo<1'.
*
* @return The package dictionary on match, otherwise NULL is returned.
*/
prop_dictionary_t
xbps_find_virtualpkg_conf_in_array_by_pattern(prop_array_t array,
const char *pattern);
prop_dictionary_t
xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
const char *key,
const char *name);
prop_dictionary_t
xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t d,
const char *key,
const char *pattern);
/**
* Match a package name in the specified array of strings.
*

18
include/xbps_api_impl.h
View File

@ -127,6 +127,24 @@ int HIDDEN xbps_repository_find_pkg_deps(struct xbps_handle *,
int HIDDEN xbps_requiredby_pkg_add(struct xbps_handle *, prop_dictionary_t);
int HIDDEN xbps_requiredby_pkg_remove(const char *);
/**
* @private
* From lib/plist_find.c
*/
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_array_by_name(prop_array_t, const char *);
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t,
const char *,
const char *);
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_array_by_pattern(prop_array_t,
const char *);
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t,
const char *,
const char *);
/**
* @private
* From lib/transaction_sortdeps.c

8
lib/plist_find.c
View File

@ -211,13 +211,13 @@ find_virtualpkg_user_in_array(prop_array_t array,
return find_pkg_in_array(array, vpkgname, false, false);
}
prop_dictionary_t
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_array_by_name(prop_array_t array, const char *name)
{
return find_virtualpkg_user_in_array(array, name, false);
}
prop_dictionary_t
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_array_by_pattern(prop_array_t array, const char *p)
{
return find_virtualpkg_user_in_array(array, p, true);
@ -312,7 +312,7 @@ xbps_find_virtualpkg_in_dict_by_pattern(prop_dictionary_t d,
return find_pkg_in_dict(d, key, pattern, true, true);
}
prop_dictionary_t
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
const char *key,
const char *name)
@ -320,7 +320,7 @@ xbps_find_virtualpkg_conf_in_dict_by_name(prop_dictionary_t d,
return find_virtualpkg_user_in_dict(d, key, name, false);
}
prop_dictionary_t
prop_dictionary_t HIDDEN
xbps_find_virtualpkg_conf_in_dict_by_pattern(prop_dictionary_t d,
const char *key,
const char *pattern)