aboutsummaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-08-07 10:19:54 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-08-07 10:19:54 +0000
commitf952d5a305acdd4e51d30f781ffe0c198069bf01 (patch)
tree80fcb46b860482b3a3bb85fd686cdad1222c5010 /log.c
parentMerge branch 'xstrndup+xrealloc' into master (diff)
parentlog: simplify _sys_log() function (diff)
Merge branch 'syslog' into master
Diffstat (limited to 'log.c')
-rw-r--r--log.c31
1 files changed, 6 insertions, 25 deletions
diff --git a/log.c b/log.c
index 23d4b197..eff6992d 100644
--- a/log.c
+++ b/log.c
@@ -97,33 +97,14 @@ _sys_log(enum log_class log_class, const char *module,
assert(level != -1);
- const char *sys_err = sys_errno != 0 ? strerror(sys_errno) : NULL;
+ char msg[4096];
+ int n = vsnprintf(msg, sizeof(msg), fmt, va);
+ assert(n >= 0);
- va_list va2;
- va_copy(va2, va);
+ if (sys_errno != 0 && (size_t)n < sizeof(msg))
+ snprintf(msg + n, sizeof(msg) - n, ": %s", strerror(sys_errno));
- /* Calculate required size of buffer holding the entire log message */
- int required_len = 0;
- required_len += strlen(module) + 2; /* "%s: " */
- required_len += vsnprintf(NULL, 0, fmt, va2); va_end(va2);
-
- if (sys_errno != 0)
- required_len += strlen(sys_err) + 2; /* ": %s" */
-
- /* Format the msg */
- char *msg = malloc(required_len + 1);
- int idx = 0;
-
- idx += snprintf(&msg[idx], required_len + 1 - idx, "%s: ", module);
- idx += vsnprintf(&msg[idx], required_len + 1 - idx, fmt, va);
-
- if (sys_errno != 0) {
- snprintf(
- &msg[idx], required_len + 1 - idx, ": %s", strerror(sys_errno));
- }
-
- syslog(level, "%s", msg);
- free(msg);
+ syslog(level, "%s: %s", module, msg);
}
void