From 7c14e48776cf82b521cc8b7dad05892a81b8659b Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 24 Feb 2011 09:38:59 -0600 Subject: Mark log callback format string const Signed-off-by: Dan McGee --- lib/libalpm/alpm.h | 4 ++-- lib/libalpm/log.c | 4 ++-- lib/libalpm/log.h | 2 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/testdb.c | 2 +- src/util/testpkg.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 7fec293d..8e1e022a 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -74,8 +74,8 @@ typedef enum _pmloglevel_t { PM_LOG_FUNCTION = (1 << 3) } pmloglevel_t; -typedef void (*alpm_cb_log)(pmloglevel_t, char *, va_list); -int alpm_logaction(char *fmt, ...); +typedef void (*alpm_cb_log)(pmloglevel_t, const char *, va_list); +int alpm_logaction(const char *fmt, ...); /* * Downloading diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index dc4f938a..09c6fb84 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -42,7 +42,7 @@ * @param fmt output format * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_logaction(char *fmt, ...) +int SYMEXPORT alpm_logaction(const char *fmt, ...) { int ret; va_list args; @@ -88,7 +88,7 @@ int SYMEXPORT alpm_logaction(char *fmt, ...) /** @} */ -void _alpm_log(pmloglevel_t flag, char *fmt, ...) +void _alpm_log(pmloglevel_t flag, const char *fmt, ...) { va_list args; alpm_cb_log logcb = alpm_option_get_logcb(); diff --git a/lib/libalpm/log.h b/lib/libalpm/log.h index 5ce08e45..9a2961fb 100644 --- a/lib/libalpm/log.h +++ b/lib/libalpm/log.h @@ -29,7 +29,7 @@ #define ALPM_LOG_FUNC #endif -void _alpm_log(pmloglevel_t flag, char *fmt, ...) __attribute__((format(printf,2,3))); +void _alpm_log(pmloglevel_t flag, const char *fmt, ...) __attribute__((format(printf,2,3))); #endif /* _ALPM_LOG_H */ diff --git a/src/pacman/callback.c b/src/pacman/callback.c index f1e71bb4..a80172b2 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -669,7 +669,7 @@ void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total) } /* Callback to handle notifications from the library */ -void cb_log(pmloglevel_t level, char *fmt, va_list args) +void cb_log(pmloglevel_t level, const char *fmt, va_list args) { if(!fmt || strlen(fmt) == 0) { return; diff --git a/src/pacman/callback.h b/src/pacman/callback.h index f5bf1c1d..1109a3b2 100644 --- a/src/pacman/callback.h +++ b/src/pacman/callback.h @@ -41,7 +41,7 @@ void cb_dl_total(off_t total); void cb_dl_progress(const char *filename, off_t file_xfered, off_t file_total); /* callback to handle messages/notifications from pacman library */ -void cb_log(pmloglevel_t level, char *fmt, va_list args); +void cb_log(pmloglevel_t level, const char *fmt, va_list args); #endif /* _PM_CALLBACK_H */ diff --git a/src/util/cleanupdelta.c b/src/util/cleanupdelta.c index 36a4e072..5d2bbf6c 100644 --- a/src/util/cleanupdelta.c +++ b/src/util/cleanupdelta.c @@ -37,7 +37,7 @@ static void cleanup(int signum) { exit(signum); } -static void output_cb(pmloglevel_t level, char *fmt, va_list args) +static void output_cb(pmloglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { switch(level) { diff --git a/src/util/testdb.c b/src/util/testdb.c index 124a66dd..4e49ce6a 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -39,7 +39,7 @@ static void cleanup(int signum) { exit(signum); } -static void output_cb(pmloglevel_t level, char *fmt, va_list args) +static void output_cb(pmloglevel_t level, const char *fmt, va_list args) { if(strlen(fmt)) { switch(level) { diff --git a/src/util/testpkg.c b/src/util/testpkg.c index 0dd8db8f..d0d9cac1 100644 --- a/src/util/testpkg.c +++ b/src/util/testpkg.c @@ -24,7 +24,7 @@ #define BASENAME "testpkg" -static void output_cb(pmloglevel_t level, char *fmt, va_list args) +static void output_cb(pmloglevel_t level, const char *fmt, va_list args) { if(fmt[0] == '\0') { return; -- cgit v1.2.3-70-g09d2