aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2012-07-12 09:26:25 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-07-12 09:26:25 +0200
commitfb4bfc2ad5a3492d72a612e16fd4b69eb01f96e3 (patch)
treed6b024fccc26c866a31c20ca46d84961d9e5146f
parente62651f22064ac44930ec91eda7f74b1014b420f (diff)
logging: Fix compile breakage introduced by the warning fixes
Make sure the declaration and definition match, add const to the functions called by logp/logp2. Compile output: logging.c:317: error: conflicting types for 'logp' ../include/osmocom/core/logging.h:34: note: previous declaration of 'logp' was here logging.c:327: error: conflicting types for 'logp2' ../include/osmocom/core/logging.h:168: note: previous declaration of 'logp2' was here make[3]: *** [logging.lo] Error 1
-rw-r--r--include/osmocom/core/logging.h2
-rw-r--r--src/logging.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index bbaef45..989228b 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -28,7 +28,7 @@
#endif
-void osmo_vlogp(int subsys, int level, char *file, int line,
+void osmo_vlogp(int subsys, int level, const char *file, int line,
int cont, const char *format, va_list ap);
void logp(int subsys, const char *file, int line, int cont, const char *format, ...) __attribute__ ((format (printf, 5, 6)));
diff --git a/src/logging.c b/src/logging.c
index 8dfc31e..1ab8767 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -214,7 +214,7 @@ static const char* color(int subsys)
}
static void _output(struct log_target *target, unsigned int subsys,
- unsigned int level, char *file, int line, int cont,
+ unsigned int level, const char *file, int line, int cont,
const char *format, va_list ap)
{
char buf[4096];
@@ -264,7 +264,7 @@ err:
}
/*! \brief vararg version of logging function */
-void osmo_vlogp(int subsys, int level, char *file, int line,
+void osmo_vlogp(int subsys, int level, const char *file, int line,
int cont, const char *format, va_list ap)
{
struct log_target *tar;
@@ -314,7 +314,7 @@ void osmo_vlogp(int subsys, int level, char *file, int line,
}
}
-void logp(int subsys, char *file, int line, int cont,
+void logp(int subsys, const char *file, int line, int cont,
const char *format, ...)
{
va_list ap;
@@ -324,7 +324,7 @@ void logp(int subsys, char *file, int line, int cont,
va_end(ap);
}
-void logp2(int subsys, unsigned int level, char *file, int line, int cont, const char *format, ...)
+void logp2(int subsys, unsigned int level, const char *file, int line, int cont, const char *format, ...)
{
va_list ap;