| Message ID | 20220818080550.177771-1-a@unstable.cc |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] ssh_util: fix prototype style | expand |
Hi, Typo, subject should probably be s/ssh_util/ssl_util Regards, Simon > Function prototypes should have the return type on the same line as the > function name itself. Fix this in ssl_util.h. > > Signed-off-by: Antonio Quartulli <a@unstable.cc> > --- > src/openvpn/ssl_util.h | 13 +++++-------- > 1 file changed, 5 insertions(+), 8 deletions(-) > > diff --git a/src/openvpn/ssl_util.h b/src/openvpn/ssl_util.h > index f38294c1..3695ca3c 100644 > --- a/src/openvpn/ssl_util.h > +++ b/src/openvpn/ssl_util.h > @@ -41,10 +41,8 @@ > * @return The content of the variable as NULL terminated string or NULL > if the > * variable cannot be found. > */ > -char * > -extract_var_peer_info(const char *peer_info, > - const char *var, > - struct gc_arena *gc); > +char *extract_var_peer_info(const char *peer_info, const char *var, > + struct gc_arena *gc); > > /** > * Extracts the IV_PROTO variable and returns its value or 0 > @@ -52,8 +50,7 @@ extract_var_peer_info(const char *peer_info, > * > * @param peer_info peer info string to search for IV_PROTO > */ > -unsigned int > -extract_iv_proto(const char *peer_info); > +unsigned int extract_iv_proto(const char *peer_info); > > /** > * Takes a locally produced OCC string for TLS server mode and modifies > as > @@ -67,6 +64,6 @@ extract_iv_proto(const char *peer_info); > * @param gc gc_arena to allocate the returned string in > * @return the modified string or options on error > */ > -const char * > -options_string_compat_lzo(const char *options, struct gc_arena *gc); > +const char *options_string_compat_lzo(const char *options, struct > gc_arena *gc); > + > #endif > -- > 2.30.2 > > > > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel >
Acked-by: Gert Doering <gert@greenie.muc.de> Seems we need an uncrustify option to enforce this for new code (*most* prototypes have the "all-in-one-line" approach, some follow the "return type on previous line" as for functions). Subject fixed, ssl_util, not ssh_util :-) Your patch has been applied to the master branch. commit 31346b8d8df6fb09faa56d53508205a8b74c15df Author: Antonio Quartulli Date: Thu Aug 18 10:05:50 2022 +0200 ssl_util: fix prototype style Signed-off-by: Antonio Quartulli <a@unstable.cc> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20220818080550.177771-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24983.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/ssl_util.h b/src/openvpn/ssl_util.h index f38294c1..3695ca3c 100644 --- a/src/openvpn/ssl_util.h +++ b/src/openvpn/ssl_util.h @@ -41,10 +41,8 @@ * @return The content of the variable as NULL terminated string or NULL if the * variable cannot be found. */ -char * -extract_var_peer_info(const char *peer_info, - const char *var, - struct gc_arena *gc); +char *extract_var_peer_info(const char *peer_info, const char *var, + struct gc_arena *gc); /** * Extracts the IV_PROTO variable and returns its value or 0 @@ -52,8 +50,7 @@ extract_var_peer_info(const char *peer_info, * * @param peer_info peer info string to search for IV_PROTO */ -unsigned int -extract_iv_proto(const char *peer_info); +unsigned int extract_iv_proto(const char *peer_info); /** * Takes a locally produced OCC string for TLS server mode and modifies as @@ -67,6 +64,6 @@ extract_iv_proto(const char *peer_info); * @param gc gc_arena to allocate the returned string in * @return the modified string or options on error */ -const char * -options_string_compat_lzo(const char *options, struct gc_arena *gc); +const char *options_string_compat_lzo(const char *options, struct gc_arena *gc); + #endif
Function prototypes should have the return type on the same line as the function name itself. Fix this in ssl_util.h. Signed-off-by: Antonio Quartulli <a@unstable.cc> --- src/openvpn/ssl_util.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)