| Message ID | 20220518105157.9026-1-frank@lichtenheld.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] uncrustify: have exactly one newline at the end of files | expand |
Hi, On 18/05/2022 12:51, Frank Lichtenheld wrote: > Avoid the ugly "No newline at end of file" in git > diffs. > > Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> It does what we want. Acked-by: Antonio Quartulli <a@unstable.cc> > --- > dev-tools/uncrustify.conf | 2 ++ > src/compat/compat-daemon.c | 1 - > src/openvpn/ssl_ncp.c | 2 +- > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/dev-tools/uncrustify.conf b/dev-tools/uncrustify.conf > index 25eb4cdd..a04c6164 100644 > --- a/dev-tools/uncrustify.conf > +++ b/dev-tools/uncrustify.conf > @@ -45,6 +45,8 @@ nl_enum_leave_one_liners=true > nl_brace_fparen=add > nl_max=4 > nl_after_func_proto=2 > +nl_end_of_file_min=1 > +nl_end_of_file=force > > # Always use scoping braces for conditionals > mod_full_brace_if=add > diff --git a/src/compat/compat-daemon.c b/src/compat/compat-daemon.c > index 197bc3f1..460b9e99 100644 > --- a/src/compat/compat-daemon.c > +++ b/src/compat/compat-daemon.c > @@ -102,4 +102,3 @@ daemon(int nochdir, int noclose) > } > > #endif /* ifndef HAVE_DAEMON */ > - > diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c > index 4a083e24..4bcbc69a 100644 > --- a/src/openvpn/ssl_ncp.c > +++ b/src/openvpn/ssl_ncp.c > @@ -494,4 +494,4 @@ p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session) > multi->use_peer_id, multi->peer_id, common_cipher); > > gc_free(&gc); > -} > \ No newline at end of file > +}
Thanks for digging up a way to make uncrustify fix these. Annoying,
and I did not always catch these...
Your patch has been applied to the master branch.
commit a76153c1ca98c841b8c8cf3b6ade6c00ee3876a5
Author: Frank Lichtenheld
Date: Wed May 18 12:51:57 2022 +0200
uncrustify: have exactly one newline at the end of files
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Antonio Quartulli <a@unstable.cc>
Message-Id: <20220518105157.9026-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24386.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
--
kind regards,
Gert Doering
diff --git a/dev-tools/uncrustify.conf b/dev-tools/uncrustify.conf index 25eb4cdd..a04c6164 100644 --- a/dev-tools/uncrustify.conf +++ b/dev-tools/uncrustify.conf @@ -45,6 +45,8 @@ nl_enum_leave_one_liners=true nl_brace_fparen=add nl_max=4 nl_after_func_proto=2 +nl_end_of_file_min=1 +nl_end_of_file=force # Always use scoping braces for conditionals mod_full_brace_if=add diff --git a/src/compat/compat-daemon.c b/src/compat/compat-daemon.c index 197bc3f1..460b9e99 100644 --- a/src/compat/compat-daemon.c +++ b/src/compat/compat-daemon.c @@ -102,4 +102,3 @@ daemon(int nochdir, int noclose) } #endif /* ifndef HAVE_DAEMON */ - diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c index 4a083e24..4bcbc69a 100644 --- a/src/openvpn/ssl_ncp.c +++ b/src/openvpn/ssl_ncp.c @@ -494,4 +494,4 @@ p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session) multi->use_peer_id, multi->peer_id, common_cipher); gc_free(&gc); -} \ No newline at end of file +}
Avoid the ugly "No newline at end of file" in git diffs. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com> --- dev-tools/uncrustify.conf | 2 ++ src/compat/compat-daemon.c | 1 - src/openvpn/ssl_ncp.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)