X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Flog.c;h=0063f3ea7eed13d2239f28f85cda35d8a475d927;hb=534019614dd611e7df29a0c8c59f2a869a2c0c39;hp=713fa768c0c6acb91806d52319d4802d52d05962;hpb=6ff61377466b0dcc92aacddb62236773bd6c7d1d;p=libucw.git diff --git a/lib/log.c b/lib/log.c index 713fa768..0063f3ea 100644 --- a/lib/log.c +++ b/lib/log.c @@ -26,7 +26,7 @@ void (*log_die_hook)(void); void (*log_switch_hook)(struct tm *tm); void -vlog_msg(unsigned int cat, const char *msg, va_list args) +vmsg(unsigned int cat, const char *fmt, va_list args) { struct timeval tv; struct tm tm; @@ -66,7 +66,7 @@ vlog_msg(unsigned int cat, const char *msg, va_list args) l0 = p - buf + 1; r = buflen - l0; va_copy(args2, args); - l = vsnprintf(p, r, msg, args2); + l = vsnprintf(p, r, fmt, args2); va_end(args2); if (l < 0) l = r; @@ -87,22 +87,22 @@ vlog_msg(unsigned int cat, const char *msg, va_list args) } void -log_msg(unsigned int cat, const char *msg, ...) +msg(unsigned int cat, const char *fmt, ...) { va_list args; - va_start(args, msg); - vlog_msg(cat, msg, args); + va_start(args, fmt); + vmsg(cat, fmt, args); va_end(args); } void -die(const char *msg, ...) +die(const char *fmt, ...) { va_list args; - va_start(args, msg); - vlog_msg(L_FATAL, msg, args); + va_start(args, fmt); + vmsg(L_FATAL, fmt, args); va_end(args); if (log_die_hook) log_die_hook(); @@ -114,9 +114,9 @@ die(const char *msg, ...) } void -assert_failed(char *assertion, char *file, int line) +assert_failed(const char *assertion, const char *file, int line) { - log(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line); + msg(L_FATAL, "Assertion `%s' failed at %s:%d", assertion, file, line); abort(); } @@ -126,10 +126,10 @@ assert_failed_noinfo(void) die("Internal error: Assertion failed."); } -static byte * -log_basename(byte *n) +static const char * +log_basename(const char *n) { - byte *p = n; + const char *p = n; while (*n) if (*n++ == '/') @@ -138,7 +138,7 @@ log_basename(byte *n) } void -log_init(byte *argv0) +log_init(const char *argv0) { if (argv0) {