From 69a1eb8293621d13651d3de57e00be4574e326f8 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 23 Dec 2020 11:41:39 +0900 Subject: DEB uncrustify-trinity: backported commit 64d93e3fb from upstream git repository. This fixes a problem with the max level of braces that can be handled. Upstream commit message: ----------------------------------------------------------- Author: Guy Maurel Date: Thu Nov 12 18:27:38 2020 +0100 look for a debug loop M src/align_func_proto.cpp M src/logger.cpp ----------------------------------------------------------- Signed-off-by: Michele Calgaro --- .../debian/patches/006_upstream_64d93e3fb.diff | 25 ++++++++++++++++++++++ .../debian/patches/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff new file mode 100644 index 00000000..ca26d397 --- /dev/null +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/006_upstream_64d93e3fb.diff @@ -0,0 +1,25 @@ +Backported commit 64d93e3fb from upstream git repository. +--- a/src/align_func_proto.cpp ++++ b/src/align_func_proto.cpp +@@ -47,8 +47,8 @@ + log_rule_B("align_var_def_amp_style"); + size_t myamp_style = options::align_var_def_amp_style(); + +- const size_t max_level_count = 8; +- const size_t max_brace_level = 8; ++ const size_t max_level_count = 16; ++ const size_t max_brace_level = 16; + + AlignStack many_as[max_level_count + 1][max_brace_level + 1]; + +--- a/src/logger.cpp ++++ b/src/logger.cpp +@@ -194,7 +194,7 @@ + return; + } + // the value of buffer_length is experimental +- const int buffer_length = 4100; ++ const int buffer_length = 40000; + char buf[buffer_length]; + + // it MUST be a 'unsigned int' variable to be runable under windows diff --git a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series index de7beae0..1cf3e23a 100644 --- a/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series +++ b/debian/uncrustify-trinity/uncrustify-trinity-0.72.0/debian/patches/series @@ -3,3 +3,4 @@ 003_allow_older_distributions.diff 004_fixed_usage.diff 005_upstream_45681e88.diff +006_upstream_64d93e3fb.diff -- cgit v1.2.3