summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-07-26 05:50:54 +0200
committerDan McGee <dan@archlinux.org>2010-07-27 17:10:55 +0200
commitfa4f25626c462e88ca0f6457bf9942980a5bd329 (patch)
treea70bc1889b504257ece68a1f7b43b00590fca70e
parentf8d7cd6b2623a864aa85fbdcdd629f3ff92a631c (diff)
downloadpacman-fa4f25626c462e88ca0f6457bf9942980a5bd329.tar.gz
pacman-fa4f25626c462e88ca0f6457bf9942980a5bd329.tar.xz
Mark sync_pkg and sync_target as static functions
We no longer use these anywhere outside of sync.c, so do the rename and add static to their definition to meet our coding standards. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/sync.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index bc7c3dc2..f8193962 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -202,7 +202,7 @@ int SYMEXPORT alpm_sync_sysupgrade(int enable_downgrade)
return(0);
}
-int _alpm_sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
+static int sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
{
pmtrans_t *trans;
pmdb_t *db_local;
@@ -248,7 +248,7 @@ int _alpm_sync_pkg(pmpkg_t *spkg, alpm_list_t *pkg_list)
return(0);
}
-int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
+static int sync_target(alpm_list_t *dbs_sync, char *target)
{
alpm_list_t *i, *j;
alpm_list_t *known_pkgs = NULL;
@@ -268,7 +268,7 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
_alpm_dep_free(dep);
if(spkg != NULL) {
- return(_alpm_sync_pkg(spkg, handle->trans->add));
+ return(sync_pkg(spkg, handle->trans->add));
}
_alpm_log(PM_LOG_DEBUG, "%s package not found, searching for group...\n", target);
@@ -279,7 +279,7 @@ int _alpm_sync_target(alpm_list_t *dbs_sync, char *target)
found = 1;
for(j = alpm_grp_get_pkgs(grp); j; j = j->next) {
pmpkg_t *pkg = j->data;
- if(_alpm_sync_pkg(pkg, known_pkgs) == -1) {
+ if(sync_pkg(pkg, known_pkgs) == -1) {
if(pm_errno == PM_ERR_TRANS_DUP_TARGET || pm_errno == PM_ERR_PKG_IGNORED) {
/* just skip duplicate or ignored targets */
continue;
@@ -333,7 +333,7 @@ int SYMEXPORT alpm_sync_dbtarget(char *dbname, char *target)
if(dbs == NULL) {
RET_ERR(PM_ERR_PKG_REPO_NOT_FOUND, -1);
}
- return(_alpm_sync_target(dbs, target));
+ return(sync_target(dbs, target));
}
/** Add a sync target to the transaction.
@@ -350,7 +350,7 @@ int SYMEXPORT alpm_sync_target(char *target)
ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
dbs_sync = handle->dbs_sync;
- return(_alpm_sync_target(dbs_sync,target));
+ return(sync_target(dbs_sync,target));
}
/** Compute the size of the files that will be downloaded to install a