bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefix alpm_transprog_t members with ALPM

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-07-02 02:01:39 +10:00
parent 495ba26e63
commit bd88a8d551
7 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libalpm/add.c
View file

@ -565,10 +565,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
/* call PROGRESS once with 0 percent, as we sort-of skip that here */ /* call PROGRESS once with 0 percent, as we sort-of skip that here */
if(is_upgrade) { if(is_upgrade) {
PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START, PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START,
alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current); alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current);
} else { } else {
PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START, PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START,
alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current); alpm_pkg_get_name(newpkg), 0, pkg_count, pkg_current);
} }
@ -592,11 +592,11 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
} }
if(is_upgrade) { if(is_upgrade) {
PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START, PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START,
alpm_pkg_get_name(newpkg), percent, pkg_count, alpm_pkg_get_name(newpkg), percent, pkg_count,
pkg_current); pkg_current);
} else { } else {
PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START, PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START,
alpm_pkg_get_name(newpkg), percent, pkg_count, alpm_pkg_get_name(newpkg), percent, pkg_count,
pkg_current); pkg_current);
} }
@ -649,10 +649,10 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
} }
if(is_upgrade) { if(is_upgrade) {
PROGRESS(trans, PM_TRANS_PROGRESS_UPGRADE_START, PROGRESS(trans, ALPM_TRANS_PROGRESS_UPGRADE_START,
alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current); alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
} else { } else {
PROGRESS(trans, PM_TRANS_PROGRESS_ADD_START, PROGRESS(trans, ALPM_TRANS_PROGRESS_ADD_START,
alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current); alpm_pkg_get_name(newpkg), 100, pkg_count, pkg_current);
} }

12
lib/libalpm/alpm.h
View file

@ -860,12 +860,12 @@ typedef enum _alpm_transconv_t {
/** Transaction Progress */ /** Transaction Progress */
typedef enum _alpm_transprog_t { typedef enum _alpm_transprog_t {
PM_TRANS_PROGRESS_ADD_START, ALPM_TRANS_PROGRESS_ADD_START,
PM_TRANS_PROGRESS_UPGRADE_START, ALPM_TRANS_PROGRESS_UPGRADE_START,
PM_TRANS_PROGRESS_REMOVE_START, ALPM_TRANS_PROGRESS_REMOVE_START,
PM_TRANS_PROGRESS_CONFLICTS_START, ALPM_TRANS_PROGRESS_CONFLICTS_START,
PM_TRANS_PROGRESS_DISKSPACE_START, ALPM_TRANS_PROGRESS_DISKSPACE_START,
PM_TRANS_PROGRESS_INTEGRITY_START, ALPM_TRANS_PROGRESS_INTEGRITY_START,
} alpm_transprog_t; } alpm_transprog_t;
/** Transaction Event callback */ /** Transaction Event callback */

4
lib/libalpm/conflict.c
View file

@ -389,7 +389,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
} }
int percent = (current * 100) / numtargs; int percent = (current * 100) / numtargs;
PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", percent, PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", percent,
numtargs, current); numtargs, current);
/* CHECK 1: check every target against every target */ /* CHECK 1: check every target against every target */
_alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n", _alpm_log(handle, ALPM_LOG_DEBUG, "searching for file conflicts: %s\n",
@ -550,7 +550,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
FREELIST(tmpfiles); FREELIST(tmpfiles);
} }
} }
PROGRESS(trans, PM_TRANS_PROGRESS_CONFLICTS_START, "", 100, PROGRESS(trans, ALPM_TRANS_PROGRESS_CONFLICTS_START, "", 100,
numtargs, current); numtargs, current);
return conflicts; return conflicts;

6
lib/libalpm/diskspace.c
View file

@ -285,7 +285,7 @@ int _alpm_check_diskspace(alpm_handle_t *handle)
for(targ = trans->remove; targ; targ = targ->next, current++) { for(targ = trans->remove; targ; targ = targ->next, current++) {
alpm_pkg_t *local_pkg; alpm_pkg_t *local_pkg;
int percent = (current * 100) / numtargs; int percent = (current * 100) / numtargs;
PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent, PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
numtargs, current); numtargs, current);
local_pkg = targ->data; local_pkg = targ->data;
@ -296,7 +296,7 @@ int _alpm_check_diskspace(alpm_handle_t *handle)
for(targ = trans->add; targ; targ = targ->next, current++) { for(targ = trans->add; targ; targ = targ->next, current++) {
alpm_pkg_t *pkg, *local_pkg; alpm_pkg_t *pkg, *local_pkg;
int percent = (current * 100) / numtargs; int percent = (current * 100) / numtargs;
PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent, PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
numtargs, current); numtargs, current);
pkg = targ->data; pkg = targ->data;
@ -315,7 +315,7 @@ int _alpm_check_diskspace(alpm_handle_t *handle)
} }
} }
PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", 100, PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", 100,
numtargs, current); numtargs, current);
for(i = mount_points; i; i = alpm_list_next(i)) { for(i = mount_points; i; i = alpm_list_next(i)) {

6
lib/libalpm/remove.c
View file

@ -405,7 +405,7 @@ int _alpm_remove_packages(alpm_handle_t *handle)
_alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum); _alpm_log(handle, ALPM_LOG_DEBUG, "removing %ld files\n", (unsigned long)filenum);
/* init progress bar */ /* init progress bar */
PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, 0, PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, info->name, 0,
pkg_count, (pkg_count - targcount + 1)); pkg_count, (pkg_count - targcount + 1));
/* iterate through the list backwards, unlinking files */ /* iterate through the list backwards, unlinking files */
@ -416,7 +416,7 @@ int _alpm_remove_packages(alpm_handle_t *handle)
/* update progress bar after each file */ /* update progress bar after each file */
percent = (position * 100) / filenum; percent = (position * 100) / filenum;
PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, info->name, PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, info->name,
percent, pkg_count, (pkg_count - targcount + 1)); percent, pkg_count, (pkg_count - targcount + 1));
position++; position++;
} }
@ -424,7 +424,7 @@ int _alpm_remove_packages(alpm_handle_t *handle)
} }
/* set progress to 100% after we finish unlinking files */ /* set progress to 100% after we finish unlinking files */
PROGRESS(trans, PM_TRANS_PROGRESS_REMOVE_START, pkgname, 100, PROGRESS(trans, ALPM_TRANS_PROGRESS_REMOVE_START, pkgname, 100,
pkg_count, (pkg_count - targcount + 1)); pkg_count, (pkg_count - targcount + 1));
/* run the post-remove script if it exists */ /* run the post-remove script if it exists */

4
lib/libalpm/sync.c
View file

@ -865,7 +865,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
char *filepath; char *filepath;
pgp_verify_t check_sig; pgp_verify_t check_sig;
PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", percent, PROGRESS(trans, ALPM_TRANS_PROGRESS_INTEGRITY_START, "", percent,
numtargs, current); numtargs, current);
if(spkg->origin == PKG_FROM_FILE) { if(spkg->origin == PKG_FROM_FILE) {
continue; /* pkg_load() has been already called, this package is valid */ continue; /* pkg_load() has been already called, this package is valid */
@ -895,7 +895,7 @@ int _alpm_sync_commit(alpm_handle_t *handle, alpm_list_t **data)
_alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */ _alpm_pkg_free_trans(spkg); /* spkg has been removed from the target list */
} }
PROGRESS(trans, PM_TRANS_PROGRESS_INTEGRITY_START, "", 100, PROGRESS(trans, ALPM_TRANS_PROGRESS_INTEGRITY_START, "", 100,
numtargs, current); numtargs, current);
EVENT(trans, ALPM_TRANS_EVT_INTEGRITY_DONE, NULL, NULL); EVENT(trans, ALPM_TRANS_EVT_INTEGRITY_DONE, NULL, NULL);

12
src/pacman/callback.c
View file

@ -381,22 +381,22 @@ void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent,
/* set text of message to display */ /* set text of message to display */
switch (event) { switch (event) {
case PM_TRANS_PROGRESS_ADD_START: case ALPM_TRANS_PROGRESS_ADD_START:
opr = _("installing"); opr = _("installing");
break; break;
case PM_TRANS_PROGRESS_UPGRADE_START: case ALPM_TRANS_PROGRESS_UPGRADE_START:
opr = _("upgrading"); opr = _("upgrading");
break; break;
case PM_TRANS_PROGRESS_REMOVE_START: case ALPM_TRANS_PROGRESS_REMOVE_START:
opr = _("removing"); opr = _("removing");
break; break;
case PM_TRANS_PROGRESS_CONFLICTS_START: case ALPM_TRANS_PROGRESS_CONFLICTS_START:
opr = _("checking for file conflicts"); opr = _("checking for file conflicts");
break; break;
case PM_TRANS_PROGRESS_DISKSPACE_START: case ALPM_TRANS_PROGRESS_DISKSPACE_START:
opr = _("checking available disk space"); opr = _("checking available disk space");
break; break;
case PM_TRANS_PROGRESS_INTEGRITY_START: case ALPM_TRANS_PROGRESS_INTEGRITY_START:
opr = _("checking package integrity"); opr = _("checking package integrity");
break; break;
default: default: