diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-10-21 03:38:59 +0200 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-10-21 03:38:59 +0200 |
| commit | 454cf699a5eef64ccdee7b2fa6bcef610136d823 (patch) | |
| tree | 7a6f811f14d39bcda86e4191001f2c9eecd003d5 | |
| parent | 1568fd98d882add6c91255b331592691f399bd3f (diff) | |
| download | pacman-454cf699a5eef64ccdee7b2fa6bcef610136d823.tar.gz pacman-454cf699a5eef64ccdee7b2fa6bcef610136d823.tar.xz | |
More extern moving - keep extern decls in the headers makes for easier/better
reuse.
| -rw-r--r-- | lib/libalpm/alpm.h | 3 | ||||
| -rw-r--r-- | lib/libalpm/handle.c | 13 | ||||
| -rw-r--r-- | lib/libalpm/log.h | 5 | ||||
| -rw-r--r-- | lib/libalpm/server.h | 11 |
4 files changed, 17 insertions, 15 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 638bb57b..35260827 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -73,9 +73,6 @@ int alpm_release(void); #define PM_LOG_FLOW2 0x10 #define PM_LOG_FUNCTION 0x20 -/* Log callback */ -typedef void (*alpm_cb_log)(unsigned short, char *); - int alpm_logaction(char *fmt, ...); /* diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index 62abf6c1..6c1b98c5 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -39,20 +39,9 @@ #include "error.h" #include "trans.h" #include "alpm.h" +#include "server.h" #include "handle.h" -/* log */ -extern alpm_cb_log pm_logcb; -extern FtpCallback pm_dlcb; -extern unsigned char pm_logmask; -/* progress bar */ -extern char *pm_dlfnm; -extern int *pm_dloffset; -extern struct timeval *pm_dlt0, *pm_dlt; -extern float *pm_dlrate; -extern int *pm_dlxfered1; -extern unsigned char *pm_dleta_h, *pm_dleta_m, *pm_dleta_s; - pmhandle_t *_alpm_handle_new() { pmhandle_t *handle; diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index bfdc15d7..da1d9966 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -23,6 +23,11 @@ #define LOG_STR_LEN 256 +typedef void (*alpm_cb_log)(unsigned short, char *); + +extern alpm_cb_log pm_logcb; +extern unsigned char pm_logmask; + void _alpm_log(unsigned char flag, char *fmt, ...); #endif /* _ALPM_LOG_H */ diff --git a/lib/libalpm/server.h b/lib/libalpm/server.h index 85d390d6..f3dad39b 100644 --- a/lib/libalpm/server.h +++ b/lib/libalpm/server.h @@ -22,6 +22,7 @@ #define _ALPM_SERVER_H #include "list.h" +#include <ftplib.h> #define FREESERVER(p) \ do { \ @@ -48,6 +49,16 @@ int _alpm_downloadfiles_forreal(pmlist_t *servers, const char *localpath, char *_alpm_fetch_pkgurl(char *target); +extern FtpCallback pm_dlcb; + +/* progress bar */ +extern char *pm_dlfnm; +extern int *pm_dloffset; +extern struct timeval *pm_dlt0, *pm_dlt; +extern float *pm_dlrate; +extern int *pm_dlxfered1; +extern unsigned char *pm_dleta_h, *pm_dleta_m, *pm_dleta_s; + #endif /* _ALPM_SERVER_H */ /* vim: set ts=2 sw=2 noet: */ |