X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/14ad73b94d56fb8558eabfef431c34e12de00478..a1bedb6db8934e6788075a1e1cda001356cf1d8b:/lib/log.c diff --git a/lib/log.c b/lib/log.c index 0ebda63..e0b741e 100644 --- a/lib/log.c +++ b/lib/log.c @@ -92,8 +92,10 @@ static void format(char buffer[], size_t bufsize, const char *fmt, va_list ap) { int ch; size_t n = 0; - if(byte_vsnprintf(t, sizeof t, fmt, ap) < 0) - strcpy(t, "[byte_vsnprintf failed]"); + if(byte_vsnprintf(t, sizeof t, fmt, ap) < 0) { + strcpy(t, "[byte_vsnprintf failed: "); + strncat(t, fmt, sizeof t - strlen(t) - 1); + } p = t; while((ch = (unsigned char)*p++)) { if(ch >= ' ' && ch <= 126) { @@ -111,6 +113,8 @@ static void format(char buffer[], size_t bufsize, const char *fmt, va_list ap) { } /** @brief Log to a file + * @param pri Message priority (as per syslog) + * @param msg Messagge to log * @param user The @c FILE @c * to log to or NULL for @c stderr */ static void logfp(int pri, const char *msg, void *user) { @@ -177,7 +181,10 @@ static void logger(int pri, const char *fmt, ...) { } /** @brief Format and log a message + * @param pri Message priority (as per syslog) + * @param fmt Format string * @param errno_value Errno value to include as a string, or 0 + * @param ap Argument list */ void elog(int pri, int errno_value, const char *fmt, va_list ap) { char buffer[1024];