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

More extern moving - keep extern decls in the headers makes for easier/better

Browse source 
reuse.
This commit is contained in:
Aaron Griffin 2006-10-21 01:38:59 +00:00
parent 1568fd98d8
commit 454cf699a5
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/libalpm/alpm.h
View file

@ -73,9 +73,6 @@ int alpm_release(void);
#define PM_LOG_FLOW2 0x10 #define PM_LOG_FLOW2 0x10
#define PM_LOG_FUNCTION 0x20 #define PM_LOG_FUNCTION 0x20
/* Log callback */
typedef void (*alpm_cb_log)(unsigned short, char *);
int alpm_logaction(char *fmt, ...); int alpm_logaction(char *fmt, ...);
/* /*

13
lib/libalpm/handle.c
View file

@ -39,20 +39,9 @@
#include "error.h" #include "error.h"
#include "trans.h" #include "trans.h"
#include "alpm.h" #include "alpm.h"
#include "server.h"
#include "handle.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 *_alpm_handle_new()
{ {
pmhandle_t *handle; pmhandle_t *handle;

5
lib/libalpm/log.h
View file

@ -23,6 +23,11 @@
#define LOG_STR_LEN 256 #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, ...); void _alpm_log(unsigned char flag, char *fmt, ...);
#endif /* _ALPM_LOG_H */ #endif /* _ALPM_LOG_H */

11
lib/libalpm/server.h
View file

@ -22,6 +22,7 @@
#define _ALPM_SERVER_H #define _ALPM_SERVER_H
#include "list.h" #include "list.h"
#include <ftplib.h>
#define FREESERVER(p) \ #define FREESERVER(p) \
do { \ do { \
@ -48,6 +49,16 @@ int _alpm_downloadfiles_forreal(pmlist_t *servers, const char *localpath,
char *_alpm_fetch_pkgurl(char *target); 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 */ #endif /* _ALPM_SERVER_H */
/* vim: set ts=2 sw=2 noet: */ /* vim: set ts=2 sw=2 noet: */