From 1fc13bf576b82d5e5b64ba94e6306360b340ec4b Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Thu, 8 Sep 2022 00:30:06 -0400 Subject: [PATCH] Ensure debug output ends in newline * src/load.c (load_object): Debug output strings must include \n. * src/variable.c (target_environment): Ditto. * src/posixos.c: Remove extra newlines. --- src/load.c | 2 +- src/posixos.c | 10 ++++------ src/variable.c | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/load.c b/src/load.c index f86027d3..263eb357 100644 --- a/src/load.c +++ b/src/load.c @@ -84,7 +84,7 @@ load_object (const floc *flocp, int noerror, const char *ldname, { const char *err = dlerror (); if (noerror) - DB (DB_BASIC, ("%s", err)); + DB (DB_BASIC, ("%s\n", err)); else OS (error, flocp, "%s", err); return NULL; diff --git a/src/posixos.c b/src/posixos.c index 3538a6b8..8693b74e 100644 --- a/src/posixos.c +++ b/src/posixos.c @@ -163,8 +163,7 @@ jobserver_setup (int slots, const char *style) OSS (fatal, NILF, _("Cannot open jobserver %s: %s"), fifo_name, strerror (errno)); - DB (DB_JOBS, - (_("Jobserver setup (fifo %s)\n"), fifo_name)); + DB (DB_JOBS, (_("Jobserver setup (fifo %s)\n"), fifo_name)); js_type = js_fifo; } @@ -180,8 +179,8 @@ jobserver_setup (int slots, const char *style) if (r < 0) pfatal_with_name (_("creating jobs pipe")); - DB (DB_JOBS, - (_("Jobserver setup (fds %d,%d)\n"), job_fds[0], job_fds[1])); + DB (DB_JOBS, (_("Jobserver setup (fds %d,%d)\n"), + job_fds[0], job_fds[1])); js_type = js_pipe; } @@ -234,8 +233,7 @@ jobserver_parse_auth (const char *auth) /* If not, it must be a simple pipe. */ else if (sscanf (auth, "%d,%d", &rfd, &wfd) == 2) { - DB (DB_JOBS, - (_("Jobserver client (fds %d,%d)\n"), rfd, wfd)); + DB (DB_JOBS, (_("Jobserver client (fds %d,%d)\n"), rfd, wfd)); /* The parent overrode our FDs because we aren't a recursive make. */ if (rfd == -2 || wfd == -2) diff --git a/src/variable.c b/src/variable.c index 30f4424a..6c3d2125 100644 --- a/src/variable.c +++ b/src/variable.c @@ -1106,8 +1106,9 @@ target_environment (struct file *file, int recursive) function, just skip it. */ if (v->expanding && file == NULL) { - DB (DB_VERBOSE, (_("%s:%lu: Skipping export of %s to shell function due to recursive expansion"), - v->fileinfo.filenm, v->fileinfo.lineno, v->name)); + DB (DB_VERBOSE, + (_("%s:%lu: Skipping export of %s to shell function due to recursive expansion\n"), + v->fileinfo.filenm, v->fileinfo.lineno, v->name)); continue; } -- 2.47.3