Hi, On Fri, Dec 23, 2016 at 11:40:54PM +0100, Steffan Karger wrote: > This patch replaces the "Add nl_for_brace=add to uncrustify.conf" patch. > > v2: also add nl_do_brace=add and mod_full_brace_do=add > > dev-tools/uncrustify.conf | 8 +++++ [..] > diff --git a/dev-tools/uncrustify.conf b/dev-tools/uncrustify.conf > index 95e0b2a..d8ea870 100644 > --- a/dev-tools/uncrustify.conf > +++ b/dev-tools/uncrustify.conf > @@ -9,6 +9,11 @@ nl_brace_else=add > nl_elseif_brace=add > nl_else_brace=add > nl_else_if=remove > +nl_for_brace=add > +nl_while_brace=add > +nl_switch_brace=add > +nl_fdef_brace=add > +nl_do_brace=add > sp_func_proto_paren=Remove > sp_func_def_paren=Remove > sp_func_call_paren=Remove > @@ -44,6 +49,9 @@ nl_after_func_proto=2 > # Always use scoping braces for conditionals > mod_full_brace_if=add > mod_full_brace_if_chain=false > +mod_full_brace_while=add > +mod_full_brace_for=add > +mod_full_brace_do=add > > # Annotate #else and #endif statements > mod_add_long_ifdef_endif_comment=20
Both the conceptual change / uncrustify.conf and the actual code changes
look reasonable and "fully according to how I interpret our CodingStyle
wiki". So ACK.
As per the previous reformatting discussions, lets put this into master
and 2.4-after-2.4.0
gert
--
USENET is *not* the non-clickable part of WWW!
//www.muc.de/~gert/
Gert Doering - Munich, Germany g...@greenie.muc.de
fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
signature.asc
Description: PGP signature
------------------------------------------------------------------------------ Developer Access Program for Intel Xeon Phi Processors Access to Intel Xeon Phi processor-based developer platforms. With one year of Intel Parallel Studio XE. Training and support from Colfax. Order your platform today.http://sdm.link/intel
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel
