github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-30 22:34:29 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

More wide IO for FLOG

Browse Source 
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.
This commit is contained in:
Fabian Homborg 2019-05-29 08:07:04 +02:00
parent 32949eefbe
commit 66e238fad0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parse_execution.cpp
View File

@ -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.

4
src/proc.cpp
View File

@ -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