From 016bb7b5f141f5433d986aaa912a71b43a4cfdc2 Mon Sep 17 00:00:00 2001
From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 2 Nov 2017 01:12:17 +0000
Subject: [PATCH] Don't have `static' of a function definition on its own line.

Join it to the next line that species the return type.
---
 uip/folder.c     |  3 +--
 uip/mhstoresbr.c |  3 +--
 uip/replsbr.c    |  3 +--
 uip/sendsbr.c    | 12 ++++--------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/uip/folder.c b/uip/folder.c
index c8530863..4b8c12fc 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -96,8 +96,7 @@ static void readonly_folders (void);
  * Function for printing error message if folder does not exist with
  * -nocreate.
  */
-static
-void
+static void
 nonexistent_folder (int status)
 {
     NMH_UNUSED (status);
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 6bf97900..116b159a 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -1127,8 +1127,7 @@ copy_some_headers (FILE *out, CT ct)
 /******************************************************************************/
 /* -clobber support */
 
-static
-enum clobber_policy_t
+static enum clobber_policy_t
 clobber_policy (const char *value)
 {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {
diff --git a/uip/replsbr.c b/uip/replsbr.c
index 3fa67d20..2f26c373 100644
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -484,8 +484,7 @@ replfilter (FILE *in, FILE *out, char *filter, int fmtproc)
 }
 
 
-static
-char *
+static char *
 fix_addresses (char *str)
 {
     char *fixed_str = NULL;
diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 5a841b0a..974bf002 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -738,8 +738,7 @@ oops:
 }
 
 
-static
-void
+static void
 handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc)
 {
     const char *addr, *host;
@@ -848,8 +847,7 @@ setup_oauth_params(char *vec[], int *vecp, const char *auth_svc,
 /*
  * Extract user and domain from From: header line in draft.
  */
-static
-int
+static int
 get_from_header_info(const char *filename, const char **addr, const char **host, const char **message)
 {
     struct stat st;
@@ -903,8 +901,7 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
  * Get formatted information from header of a message.
  * Adapted from process_single_file() in uip/fmttest.c.
  */
-static
-const char *
+static const char *
 get_message_header_info(FILE *in, char *format)
 {
     int dat[5];
@@ -982,8 +979,7 @@ get_message_header_info(FILE *in, char *format)
  * If no -server passed in from profile or commandline, could use smtp.<svc>.com for gmail,
  * but that might not generalize for other svcs.
  */
-static
-void
+static void
 merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp)
 {
     char *addr_entry = concat("sendfrom-", addr, NULL);
-- 
2.56.0