From 66e238fad09a41899be7aee1f0b99421acbc8259 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Wed, 29 May 2019 08:07:04 +0200 Subject: [PATCH] More wide IO for FLOG This widens the remaining ones that don't take a char anywhere. The rest either use a char _variable_ or __FUNCTION__, which from my reading is narrow and needs to be widened manually. I've been unable to test it, though. See #5900. --- src/parse_execution.cpp | 2 +- src/proc.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp index 54997eca1..8d338b66f 100644 --- a/src/parse_execution.cpp +++ b/src/parse_execution.cpp @@ -636,7 +636,7 @@ parse_execution_result_t parse_execution_context_t::report_errors( const parse_error_list_t &error_list) const { if (!parser->cancellation_requested) { if (error_list.empty()) { - FLOG(error, "Error reported but no error text found."); + FLOG(error, L"Error reported but no error text found."); } // Get a backtrace. diff --git a/src/proc.cpp b/src/proc.cpp index b5165cba4..a9615f93a 100644 --- a/src/proc.cpp +++ b/src/proc.cpp @@ -686,7 +686,7 @@ void proc_update_jiffies(parser_t &parser) { // restoring a previously-stopped job, in which case we need to restore terminal attributes. bool terminal_give_to_job(const job_t *j, bool restore_attrs) { if (j->pgid == 0) { - FLOG(proc_termowner, "terminal_give_to_job() returning early due to no process group"); + FLOG(proc_termowner, L"terminal_give_to_job() returning early due to no process group"); return true; } @@ -717,7 +717,7 @@ bool terminal_give_to_job(const job_t *j, bool restore_attrs) { // guarantee the process isn't going to exit while we wait (which would cause us to possibly // block indefinitely). while (tcsetpgrp(STDIN_FILENO, j->pgid) != 0) { - FLOGF(proc_termowner, "tcsetpgrp failed: %d", errno); + FLOGF(proc_termowner, L"tcsetpgrp failed: %d", errno); bool pgroup_terminated = false; // No need to test for EINTR as we are blocking signals