tools/format-cpp: use a group of `echo` lines with a single `>& 2`

[babeltrace.git] / tools / format-cpp

diff --git a/tools/format-cpp b/tools/format-cpp
index a2c6a3aefee8c3ccbce0cb7d62f390136211a538..dfc4bbd5061a74e3dd5f179e5e53069312a2cfe3 100755 (executable)
--- a/tools/format-cpp
+++ b/tools/format-cpp
@@ -17,11 +17,14 @@ format_cpp() {
        fi
 
        if [[ "$version" != *"clang-format version $expected_formatter_major_version"* ]]; then
-               echo "Expecting clang-format $expected_formatter_major_version." >&2
-               echo >&2
-               echo Got: >&2
-               echo >&2
-               echo "$version" >&2
+               {
+                       echo "Expecting clang-format $expected_formatter_major_version."
+                       echo
+                       echo Got:
+                       echo
+                       echo "$version"
+               } >& 2
+
                return 1
        fi
 
@@ -35,7 +38,7 @@ format_cpp() {
                ! -wholename '*/cpp-common/optional.hpp' \
                ! -wholename '*/cpp-common/string_view.hpp' \
                ! -wholename '*/cpp-common/nlohmann/json.hpp' \
-               -print0 | xargs -P"$(nproc)" -n1 -0 "${formatter[@]}"
+               -print0 | xargs -P"$(nproc)" -n1 -t -0 "${formatter[@]}"
 }
 
 if [[ -n "$FORMATTER" ]]; then