[Openvpn-devel,2/3] dev-tools: Remove uncrusify -p

Message ID 20220420121322.42732-2-openvpn@sf.lists.topphemmelig.net
State Accepted
Headers show
Series [Openvpn-devel,1/3] dev-tools: Remove no longer needed openvpn-plugin.h.in patching | expand

Commit Message

David Sommerseth April 20, 2022, 12:13 p.m. UTC
From: David Sommerseth <davids@openvpn.net>

The -p option to uncrustify was providing debug information about
decisions done by uncrustify.  This was useful when debugging why
certain formatting choices.

With newer versions of uncrusitfy the -p option can only be used on
individual files and not a list of files.  Since still supporting this
would require a bigger rewrite of reformat-all.sh, it was chosen to
instead remove the usage of this option.  If certain behaviours needs to
be debugged, running uncrusity on individual files directly will work
fine anyhow.

Signed-off-by: David Sommerseth <davids@openvpn.net>
---
 dev-tools/reformat-all.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Gert Doering April 21, 2022, 7:28 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

As discussed on IRC.  Fixed 3 typos ("uncrus*t*ify -p" etc).

Your patch has been applied to the master branch.

commit fbd81db5f6d5b9b9d86ed3ca198bfffb478f2508
Author: David Sommerseth
Date:   Wed Apr 20 14:13:21 2022 +0200

     dev-tools: Remove uncrusify -p

     Signed-off-by: David Sommerseth <davids@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220420121322.42732-2-openvpn@sf.lists.topphemmelig.net>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24120.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/dev-tools/reformat-all.sh b/dev-tools/reformat-all.sh
index dc2bfc4e..ff126b0f 100755
--- a/dev-tools/reformat-all.sh
+++ b/dev-tools/reformat-all.sh
@@ -80,8 +80,8 @@  cd "$srcroot"
 
     # Kick off uncrustify
     echo
-    echo "** INFO ** Running: uncrustify -c $cfg --no-backup -l C -p debug.uncr -F $files"
-    uncrustify -c "$cfg" --no-backup -l C -p debug.uncr -F "$files" 2>&1
+    echo "** INFO ** Running: uncrustify -c $cfg --no-backup -l C -F $files"
+    uncrustify -c "$cfg" --no-backup -l C -F "$files" 2>&1
     res=$?
     echo "** INFO ** Uncrustify completed (exit code $res)"
 } | tee "${log}-1"  # Log needs to be closed here, to be processed in next block