diff --git a/src/input/readers/Raw.cc b/src/input/readers/Raw.cc index 435876ece1..ab2cb8bd44 100644 --- a/src/input/readers/Raw.cc +++ b/src/input/readers/Raw.cc @@ -359,9 +359,7 @@ int64_t Raw::GetLine(FILE* arg_file) } - if ( errno == 0 ) { - assert(false); - } else if ( errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR ) { + if ( errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR ) { return -2; } else { // an error code we did no expect. This probably is bad. @@ -369,6 +367,9 @@ int64_t Raw::GetLine(FILE* arg_file) return -3; } + InternalError("Internal control flow execution"); + assert(false); + } // write to the stdin of the child process @@ -546,7 +547,6 @@ bool Raw::DoUpdate() EndCurrentSend(); SendEvent("InputRaw::process_finished", 4, vals); - } diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.raw.stderr/out b/testing/btest/Baseline/scripts.base.frameworks.input.raw.stderr/out index e7ff580dfd..b7f857339d 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.raw.stderr/out +++ b/testing/btest/Baseline/scripts.base.frameworks.input.raw.stderr/out @@ -1,6 +1,3 @@ -Process finished event -input -Exit code != 0 Input::EVENT_NEW ..: F @@ -25,3 +22,6 @@ T done End of Data event input +Process finished event +input +Exit code != 0