summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-03-16 21:46:30 +0100
committerAurelien Foret <aurelien@archlinux.org>2005-03-16 21:46:30 +0100
commitd8cdd54a206a87a41ce66360f132e2d854a45af2 (patch)
tree7734cca5e815597dbc83754fe55bab66d7f73a95
parent03558450c5634e53e607c641f0fa0c5e98d7b4f7 (diff)
downloadpacman-d8cdd54a206a87a41ce66360f132e2d854a45af2.tar.gz
pacman-d8cdd54a206a87a41ce66360f132e2d854a45af2.tar.xz
Moved log callback definition to alpm.h
-rw-r--r--lib/libalpm/alpm.h5
-rw-r--r--lib/libalpm/log.c1
-rw-r--r--lib/libalpm/log.h2
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index c5df0d47..a2337576 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -61,6 +61,9 @@ int alpm_release();
#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, ...);
/*
@@ -209,7 +212,7 @@ enum {
PM_TRANS_EVT_UPGRADE_DONE
};
-/* Callback */
+/* Event callback */
typedef void (*alpm_trans_cb)(unsigned short, void *, void *);
/* Info parameters */
diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c
index c36851dc..2eff80e4 100644
--- a/lib/libalpm/log.c
+++ b/lib/libalpm/log.c
@@ -24,6 +24,7 @@
#include <stdarg.h>
#include <time.h>
/* pacman */
+#include "alpm.h"
#include "log.h"
/* Internal library log mechanism */
diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h
index e9a9a4f9..cdbd8c94 100644
--- a/lib/libalpm/log.h
+++ b/lib/libalpm/log.h
@@ -23,8 +23,6 @@
#define LOG_STR_LEN 256
-typedef void (*alpm_cb_log)(unsigned short, char *);
-
void _alpm_log(unsigned char flag, char *fmt, ...);
int _alpm_log_action(unsigned char usesyslog, FILE *f, char *fmt, ...);