From 8f045b9ec580b95cf133c9d720b5f65c2499f924 Mon Sep 17 00:00:00 2001 From: Cheer Xiao Date: Thu, 24 Jan 2013 19:17:55 +0800 Subject: [PATCH] Fix spelling: s/circut/circuit/g --- exec.cpp | 2 +- exec.h | 2 +- expand.cpp | 2 +- proc.cpp | 2 +- proc.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exec.cpp b/exec.cpp index e4dd5f61c..2704db683 100644 --- a/exec.cpp +++ b/exec.cpp @@ -1165,7 +1165,7 @@ void exec(parser_t &parser, job_t *j) p->completed=1; if (p->next == 0) { - debug(3, L"Set status of %ls to %d using short circut", j->command_wcstr(), p->status); + debug(3, L"Set status of %ls to %d using short circuit", j->command_wcstr(), p->status); int status = p->status; proc_set_last_status(job_get_flag(j, JOB_NEGATE)?(!status):status); diff --git a/exec.h b/exec.h index f437095bf..5aa788c96 100644 --- a/exec.h +++ b/exec.h @@ -31,7 +31,7 @@ output of the builtin. This is surprisingly cheap on my computer, probably because of the marvels of copy on write forking. - This rule is short circuted in the case where a builtin does not + This rule is short circuited in the case where a builtin does not output to a pipe and does in fact not output anything. The speed improvement from this optimization is not noticable on a normal computer/OS in regular use, but the promiscous amounts of forking diff --git a/expand.cpp b/expand.cpp index c2095f37e..4bdb563bb 100644 --- a/expand.cpp +++ b/expand.cpp @@ -1655,7 +1655,7 @@ int expand_string(const wcstring &input, std::vector &output, expa /* If process expansion matches, we are not interested in other completions, so we - short-circut and return + short-circuit and return */ if (!(flags & EXPAND_SKIP_PROCESS)) expand_pid(next, flags, output); diff --git a/proc.cpp b/proc.cpp index 7f1b86a94..1ed63b5eb 100644 --- a/proc.cpp +++ b/proc.cpp @@ -1188,7 +1188,7 @@ void job_continue(job_t *j, int cont) { /* Mark process status only if we are in the foreground - and the last process in a pipe, and it is not a short circuted builtin + and the last process in a pipe, and it is not a short circuited builtin */ if (p->pid) { diff --git a/proc.h b/proc.h index 3213f6f70..a97ccbd92 100644 --- a/proc.h +++ b/proc.h @@ -252,7 +252,7 @@ enum /** This flag is set to one on wildcard expansion errors. It means that the current command should not be executed */ JOB_WILDCARD_ERROR = 1 << 6, - /** Skip executing this job. This flag is set by the short-circut builtins, i.e. and and or */ + /** Skip executing this job. This flag is set by the short-circuit builtins, i.e. and and or */ JOB_SKIP = 1 << 7, /** Whether the job is under job control */