From 76eef0fea9545e6b543c5746789adb236cfac2cc Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Sun, 12 Dec 2021 14:05:17 -0800 Subject: [PATCH] Fix some extra arguments for string format functions. --- src/builtins/pwd.cpp | 2 +- src/iothread.cpp | 2 +- src/proc.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/builtins/pwd.cpp b/src/builtins/pwd.cpp index 92add9a2a..7e4de3f8d 100644 --- a/src/builtins/pwd.cpp +++ b/src/builtins/pwd.cpp @@ -61,7 +61,7 @@ maybe_t builtin_pwd(parser_t &parser, io_streams_t &streams, const wchar_t pwd = std::move(*real_pwd); } else { const char *error = std::strerror(errno); - streams.err.append_format(L"%ls: realpath failed:", cmd, error); + streams.err.append_format(L"%ls: realpath failed: %s", cmd, error); return STATUS_CMD_ERROR; } } diff --git a/src/iothread.cpp b/src/iothread.cpp index 9c5d10bab..91d1bd024 100644 --- a/src/iothread.cpp +++ b/src/iothread.cpp @@ -221,7 +221,7 @@ int thread_pool_t::perform(void_function_t &&func, bool cant_wait) { // Kick off the thread if we decided to do so. if (wakeup_thread) { - FLOGF(iothread, L"notifying a thread", this_thread()); + FLOGF(iothread, L"notifying thread: %p", this_thread()); pool.queue_cond.notify_one(); } if (spawn_new_thread) { diff --git a/src/proc.cpp b/src/proc.cpp index 54c5b7df4..96296caf3 100644 --- a/src/proc.cpp +++ b/src/proc.cpp @@ -924,7 +924,7 @@ int terminal_maybe_give_to_job_group(const job_group_t *jg, bool continuing_from } else { // Debug the original tcsetpgrp error (not the waitpid errno) to the log, and // then retry until not EPERM or the process group has exited. - FLOGF(proc_termowner, L"terminal_give_to_job(): EPERM.\n", pgid); + FLOGF(proc_termowner, L"terminal_give_to_job(): EPERM with pgid %d.", pgid); continue; } } else if (errno == ENOTTY) {