summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2011-06-29 15:46:49 +1000
committerAllan McRae <allan@archlinux.org>2011-06-29 15:46:49 +1000
commitf1bb56cebfda9b11ea02754d325ff659014e2caa (patch)
tree289b4d9648077a4b2245728e11a8e9469b0957b5 /lib
parent3bb469d558b5ad778f87a1427a45ec4190ba4155 (diff)
downloadpacman-f1bb56cebfda9b11ea02754d325ff659014e2caa.tar.xz
Rename public functions with grp in their name
Using grp instead of group is a small saving at the cost of clarity. Rename the following functions: alpm_option_get_ignoregrps -> alpm_option_get_ignoregroups alpm_option_add_ignoregrp -> alpm_option_add_ignoregroup alpm_option_set_ignoregrps -> alpm_option_set_ignoregroups alpm_option_remove_ignoregrp -> alpm_option_remove_ignoregroup alpm_db_readgrp -> alpm_db_readgroup alpm_db_get_grpcache -> alpm_db_get_groupcache alpm_find_grp_pkgs -> alpm_find_group_pkgs Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/alpm.h14
-rw-r--r--lib/libalpm/db.c10
-rw-r--r--lib/libalpm/db.h2
-rw-r--r--lib/libalpm/handle.c8
-rw-r--r--lib/libalpm/sync.c4
5 files changed, 19 insertions, 19 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 54a9ba42..33707dd3 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -311,10 +311,10 @@ int alpm_option_remove_ignorepkg(alpm_handle_t *handle, const char *pkg);
* should be ignored by a sysupgrade.
* @{
*/
-alpm_list_t *alpm_option_get_ignoregrps(alpm_handle_t *handle);
-int alpm_option_add_ignoregrp(alpm_handle_t *handle, const char *grp);
-int alpm_option_set_ignoregrps(alpm_handle_t *handle, alpm_list_t *ignoregrps);
-int alpm_option_remove_ignoregrp(alpm_handle_t *handle, const char *grp);
+alpm_list_t *alpm_option_get_ignoregroups(alpm_handle_t *handle);
+int alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp);
+int alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps);
+int alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *grp);
/** @} */
/** Returns the targeted architecture. */
@@ -411,13 +411,13 @@ alpm_list_t *alpm_db_get_pkgcache(alpm_db_t *db);
* @param name of the group
* @return the groups entry on success, NULL on error
*/
-alpm_group_t *alpm_db_readgrp(alpm_db_t *db, const char *name);
+alpm_group_t *alpm_db_readgroup(alpm_db_t *db, const char *name);
/** Get the group cache of a package database.
* @param db pointer to the package database to get the group from
* @return the list of groups on success, NULL on error
*/
-alpm_list_t *alpm_db_get_grpcache(alpm_db_t *db);
+alpm_list_t *alpm_db_get_groupcache(alpm_db_t *db);
/** Searches a database with regular expressions.
* @param db pointer to the package database to search in
@@ -700,7 +700,7 @@ int alpm_db_check_pgp_signature(alpm_db_t *db);
* Groups
*/
-alpm_list_t *alpm_find_grp_pkgs(alpm_list_t *dbs, const char *name);
+alpm_list_t *alpm_find_group_pkgs(alpm_list_t *dbs, const char *name);
/*
* Sync
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 72fef62e..ecb792c9 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -239,7 +239,7 @@ alpm_list_t SYMEXPORT *alpm_db_get_pkgcache(alpm_db_t *db)
}
/** Get a group entry from a package database. */
-alpm_group_t SYMEXPORT *alpm_db_readgrp(alpm_db_t *db, const char *name)
+alpm_group_t SYMEXPORT *alpm_db_readgroup(alpm_db_t *db, const char *name)
{
ASSERT(db != NULL, return NULL);
db->handle->pm_errno = 0;
@@ -250,12 +250,12 @@ alpm_group_t SYMEXPORT *alpm_db_readgrp(alpm_db_t *db, const char *name)
}
/** Get the group cache of a package database. */
-alpm_list_t SYMEXPORT *alpm_db_get_grpcache(alpm_db_t *db)
+alpm_list_t SYMEXPORT *alpm_db_get_groupcache(alpm_db_t *db)
{
ASSERT(db != NULL, return NULL);
db->handle->pm_errno = 0;
- return _alpm_db_get_grpcache(db);
+ return _alpm_db_get_groupcache(db);
}
/** Searches a database. */
@@ -646,7 +646,7 @@ void _alpm_db_free_grpcache(alpm_db_t *db)
db->status &= ~DB_STATUS_GRPCACHE;
}
-alpm_list_t *_alpm_db_get_grpcache(alpm_db_t *db)
+alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db)
{
if(db == NULL) {
return NULL;
@@ -671,7 +671,7 @@ alpm_group_t *_alpm_db_get_grpfromcache(alpm_db_t *db, const char *target)
return NULL;
}
- for(i = _alpm_db_get_grpcache(db); i; i = i->next) {
+ for(i = _alpm_db_get_groupcache(db); i; i = i->next) {
alpm_group_t *info = i->data;
if(strcmp(info->name, target) == 0) {
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index 10464b5c..5bf05d87 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -103,7 +103,7 @@ int _alpm_db_ensure_pkgcache(alpm_db_t *db, alpm_dbinfrq_t infolevel);
alpm_pkg_t *_alpm_db_get_pkgfromcache(alpm_db_t *db, const char *target);
/* groups */
void _alpm_db_free_grpcache(alpm_db_t *db);
-alpm_list_t *_alpm_db_get_grpcache(alpm_db_t *db);
+alpm_list_t *_alpm_db_get_groupcache(alpm_db_t *db);
alpm_group_t *_alpm_db_get_grpfromcache(alpm_db_t *db, const char *target);
#endif /* _ALPM_DB_H */
diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c
index bb2ce50c..62b2d9ab 100644
--- a/lib/libalpm/handle.c
+++ b/lib/libalpm/handle.c
@@ -224,7 +224,7 @@ alpm_list_t SYMEXPORT *alpm_option_get_ignorepkgs(alpm_handle_t *handle)
return handle->ignorepkg;
}
-alpm_list_t SYMEXPORT *alpm_option_get_ignoregrps(alpm_handle_t *handle)
+alpm_list_t SYMEXPORT *alpm_option_get_ignoregroups(alpm_handle_t *handle)
{
CHECK_HANDLE(handle, return NULL);
return handle->ignoregrp;
@@ -521,14 +521,14 @@ int SYMEXPORT alpm_option_remove_ignorepkg(alpm_handle_t *handle, const char *pk
return 0;
}
-int SYMEXPORT alpm_option_add_ignoregrp(alpm_handle_t *handle, const char *grp)
+int SYMEXPORT alpm_option_add_ignoregroup(alpm_handle_t *handle, const char *grp)
{
CHECK_HANDLE(handle, return -1);
handle->ignoregrp = alpm_list_add(handle->ignoregrp, strdup(grp));
return 0;
}
-int SYMEXPORT alpm_option_set_ignoregrps(alpm_handle_t *handle, alpm_list_t *ignoregrps)
+int SYMEXPORT alpm_option_set_ignoregroups(alpm_handle_t *handle, alpm_list_t *ignoregrps)
{
CHECK_HANDLE(handle, return -1);
if(handle->ignoregrp) FREELIST(handle->ignoregrp);
@@ -536,7 +536,7 @@ int SYMEXPORT alpm_option_set_ignoregrps(alpm_handle_t *handle, alpm_list_t *ign
return 0;
}
-int SYMEXPORT alpm_option_remove_ignoregrp(alpm_handle_t *handle, const char *grp)
+int SYMEXPORT alpm_option_remove_ignoregroup(alpm_handle_t *handle, const char *grp)
{
char *vdata = NULL;
CHECK_HANDLE(handle, return -1);
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index 37753487..dcce18d3 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -213,14 +213,14 @@ int SYMEXPORT alpm_sync_sysupgrade(alpm_handle_t *handle, int enable_downgrade)
* @pram name the name of the group
* @return the list of alpm_pkg_t * (caller is responsible for alpm_list_free)
*/
-alpm_list_t SYMEXPORT *alpm_find_grp_pkgs(alpm_list_t *dbs,
+alpm_list_t SYMEXPORT *alpm_find_group_pkgs(alpm_list_t *dbs,
const char *name)
{
alpm_list_t *i, *j, *pkgs = NULL, *ignorelist = NULL;
for(i = dbs; i; i = i->next) {
alpm_db_t *db = i->data;
- alpm_group_t *grp = alpm_db_readgrp(db, name);
+ alpm_group_t *grp = alpm_db_readgroup(db, name);
if(!grp)
continue;