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

Rename pmtransprog_t to alpm_transprog_t

Browse source 
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2011-06-28 14:48:50 +10:00
parent 565e167356
commit 1059df7486
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libalpm/alpm.h
View file

@ -843,14 +843,14 @@ typedef enum _alpm_transconv_t {
} alpm_transconv_t; } alpm_transconv_t;
/** Transaction Progress */ /** Transaction Progress */
typedef enum _pmtransprog_t { typedef enum _alpm_transprog_t {
PM_TRANS_PROGRESS_ADD_START, PM_TRANS_PROGRESS_ADD_START,
PM_TRANS_PROGRESS_UPGRADE_START, PM_TRANS_PROGRESS_UPGRADE_START,
PM_TRANS_PROGRESS_REMOVE_START, PM_TRANS_PROGRESS_REMOVE_START,
PM_TRANS_PROGRESS_CONFLICTS_START, PM_TRANS_PROGRESS_CONFLICTS_START,
PM_TRANS_PROGRESS_DISKSPACE_START, PM_TRANS_PROGRESS_DISKSPACE_START,
PM_TRANS_PROGRESS_INTEGRITY_START, PM_TRANS_PROGRESS_INTEGRITY_START,
} pmtransprog_t; } alpm_transprog_t;
/** Transaction Event callback */ /** Transaction Event callback */
typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *); typedef void (*alpm_trans_cb_event)(alpm_transevt_t, void *, void *);
@ -860,7 +860,7 @@ typedef void (*alpm_trans_cb_conv)(alpm_transconv_t, void *, void *,
void *, int *); void *, int *);
/** Transaction Progress callback */ /** Transaction Progress callback */
typedef void (*alpm_trans_cb_progress)(pmtransprog_t, const char *, int, size_t, size_t); typedef void (*alpm_trans_cb_progress)(alpm_transprog_t, const char *, int, size_t, size_t);
/** Returns the bitfield of flags for the current transaction. /** Returns the bitfield of flags for the current transaction.
* @param handle the context handle * @param handle the context handle

2
src/pacman/callback.c
View file

@ -343,7 +343,7 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2,
} }
/* callback to handle display of transaction progress */ /* callback to handle display of transaction progress */
void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent,
size_t howmany, size_t current) size_t howmany, size_t current)
{ {
/* size of line to allocate for text printing (e.g. not progressbar) */ /* size of line to allocate for text printing (e.g. not progressbar) */

2
src/pacman/callback.h
View file

@ -32,7 +32,7 @@ void cb_trans_conv(alpm_transconv_t event, void *data1, void *data2,
void *data3, int *response); void *data3, int *response);
/* callback to handle display of transaction progress */ /* callback to handle display of transaction progress */
void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent, void cb_trans_progress(alpm_transprog_t event, const char *pkgname, int percent,
size_t howmany, size_t remain); size_t howmany, size_t remain);
/* callback to handle receipt of total download value */ /* callback to handle receipt of total download value */