From dc05cd107cd158e3d8ee9256205aec20615a674f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 25 Apr 2007 20:02:07 -0400 Subject: Pacman side code consolidation- unify callback functions to one file Some more major code reorginization here. The download progress callback function has been renamed and moved to callback.c, which is the former trans.c with the download and log callbacks added. In addition, this allows util.c to be cleaned up as fill_progress can now be static in callback.c. We've also cut two more source files out. Signed-off-by: Dan McGee --- src/pacman/pacman.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/pacman/pacman.c') diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 9eef9dde..1be43ee8 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -44,7 +44,7 @@ #include "pacman.h" #include "util.h" #include "log.h" -#include "downloadprog.h" +#include "callback.h" #include "conf.h" #include "package.h" @@ -517,7 +517,7 @@ int main(int argc, char *argv[]) } /* set library parameters */ - alpm_option_set_dlcb(log_progress); + alpm_option_set_dlcb(cb_dl_progress); if(config->verbose > 0) { printf("Root : %s\n", alpm_option_get_root()); -- cgit v1.2.3-70-g09d2