Fixed places in the code relying the C99-ism of declarations in the

midst of a code block.

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 3ba9fbcdba619edb87f539cae007b8c9151575b4..ba9938a47edf4f2083679b14b4ef03fe2473c956 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -196,6 +196,7 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
           int debug, int onex, int queued,
            int sasl, int saslssf, char *saslmech, char *user, int tls)
 {
           int debug, int onex, int queued,
            int sasl, int saslssf, char *saslmech, char *user, int tls)
 {

+    int result, sd1, sd2;

 #ifdef CYRUS_SASL
     char *server_mechs;
 #else  /* CYRUS_SASL */
 #ifdef CYRUS_SASL
     char *server_mechs;
 #else  /* CYRUS_SASL */


@@ -204,7 +205,6 @@ smtp_init (char *client, char *server, char *port, int watch, int verbose,
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */

-    int result, sd1, sd2;

 
     if (watch)
        verbose = TRUE;
 
     if (watch)
        verbose = TRUE;


@@ -454,6 +454,9 @@ sendmail_init (char *client, char *server, int watch, int verbose,
                int debug, int onex, int queued,
                int sasl, int saslssf, char *saslmech, char *user)
 {
                int debug, int onex, int queued,
                int sasl, int saslssf, char *saslmech, char *user)
 {

+    unsigned int i, result, vecp;
+    int pdi[2], pdo[2];
+    char *vec[15];

 #ifdef CYRUS_SASL
     char *server_mechs;
 #else  /* CYRUS_SASL */
 #ifdef CYRUS_SASL
     char *server_mechs;
 #else  /* CYRUS_SASL */


@@ -463,9 +466,6 @@ sendmail_init (char *client, char *server, int watch, int verbose,
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */
     NMH_UNUSED (saslmech);
     NMH_UNUSED (user);
 #endif /* CYRUS_SASL */

-    unsigned int i, result, vecp;
-    int pdi[2], pdo[2];
-    char *vec[15];

 
     if (watch)
        verbose = TRUE;
 
     if (watch)
        verbose = TRUE;

diff --git a/sbr/fmt_scan.c b/sbr/fmt_scan.c
index 5e4bc8865337276f928722195402941294e1c8e5..3f004e5e709f713f0c704cb40ca05138320c4c4e 100644 (file)
--- a/sbr/fmt_scan.c
+++ b/sbr/fmt_scan.c
@@ -152,10 +152,11 @@ cptrimmed(char **dest, char *str, unsigned int wid, char fill, size_t n) {
            if (iswcntrl(wide_char) || iswspace(wide_char)) {
                sp += char_len;
 #else
            if (iswcntrl(wide_char) || iswspace(wide_char)) {
                sp += char_len;
 #else

+            int c;

            end--;
             /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
                intentionally warns if they are passed a char. */
            end--;
             /* isnctrl(), etc., take an int argument.  Cygwin's ctype.h
                intentionally warns if they are passed a char. */

-            int c = *sp;
+            c = *sp;

            if (iscntrl(c) || isspace(c)) {
                sp++;
 #endif
            if (iscntrl(c) || isspace(c)) {
                sp++;
 #endif

diff --git a/sbr/lock_file.c b/sbr/lock_file.c
index af9b16d154d9b8dfe203acc42c15753f1f8f9300..bbfc8fc7cf4249089f4c0ae4c44dcc89d9c9cdb1 100644 (file)
--- a/sbr/lock_file.c
+++ b/sbr/lock_file.c
@@ -586,10 +586,9 @@ timerOFF (int fd)
 static void
 alrmser (int sig)
 {
 static void
 alrmser (int sig)
 {

-    NMH_UNUSED (sig);
-

     char *lockfile;
     struct lock *lp;
     char *lockfile;
     struct lock *lp;

+    NMH_UNUSED (sig);

 
     /* update the ctime of all the lock files */
     for (lp = l_top; lp; lp = lp->l_next) {
 
     /* update the ctime of all the lock files */
     for (lp = l_top; lp; lp = lp->l_next) {

diff --git a/sbr/mts.c b/sbr/mts.c
index 1bf62ce486aa58b3c06b9bbbef57e4a0dc069ae7..cb11a776891bc843fce71789ef9b6fe54c1e0ddf 100644 (file)
--- a/sbr/mts.c
+++ b/sbr/mts.c
@@ -127,11 +127,10 @@ static struct bind binds[] = {
 void
 mts_init (char *name)
 {
 void
 mts_init (char *name)
 {

-    NMH_UNUSED (name);
-

     const char *cp;
     FILE *fp;
     static int inited = 0;
     const char *cp;
     FILE *fp;
     static int inited = 0;

+    NMH_UNUSED (name);

 
     if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
        return;
 
     if (inited++ || (fp = fopen (get_mtsconf_pathname(), "r")) == NULL)
        return;

diff --git a/uip/folder.c b/uip/folder.c
index f3b4ba4e0cf7b9fb2cbe6cb32cb8784d95cacaa2..0676bea06314b0c3d9cb92e34983a38a9c70bd04 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -457,9 +457,9 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children)
 static boolean
 get_folder_info_callback (char *fold, void *baton)
 {
 static boolean
 get_folder_info_callback (char *fold, void *baton)
 {

+    boolean crawl_children;

     NMH_UNUSED (baton);
 
     NMH_UNUSED (baton);
 

-    boolean crawl_children;

     get_folder_info_body (fold, NULL, &crawl_children);
     fflush (stdout);
     return crawl_children;
     get_folder_info_body (fold, NULL, &crawl_children);
     fflush (stdout);
     return crawl_children;

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index be63c25baf18cff3a004fa1793ee564715db40fb..df0a223b37d0e98607e0426526936179fbb9fbed 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -338,7 +338,7 @@ int
 mhl (int argc, char **argv)
 {
     int length = 0, nomore = 0;
 mhl (int argc, char **argv)
 {
     int length = 0, nomore = 0;

-    unsigned int i, vecp = 0;;
+    unsigned int i, vecp = 0;

     int width = 0;
     char *cp, *folder = NULL, *form = NULL;
     char buf[BUFSIZ], *files[MAXARGS];
     int width = 0;
     char *cp, *folder = NULL, *form = NULL;
     char buf[BUFSIZ], *files[MAXARGS];

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 9c1c0de0a84b172e4201e41f36a7fb646676bb24..99db9f83a418cfca89523af7f94b0149a6d2811f 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -529,10 +529,10 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 
        if (xpause && isatty (fileno (stdout))) {
            int intr;
 
        if (xpause && isatty (fileno (stdout))) {
            int intr;

+           SIGNAL_HANDLER istat;

 
            if (SOprintf ("Press <return> to show content..."))
                printf ("Press <return> to show content...");
 
            if (SOprintf ("Press <return> to show content..."))
                printf ("Press <return> to show content...");

-           SIGNAL_HANDLER istat;

 
            istat = SIGNAL (SIGINT, intrser);
            if ((intr = sigsetjmp (intrenv, 1)) == OK) {
 
            istat = SIGNAL (SIGINT, intrser);
            if ((intr = sigsetjmp (intrenv, 1)) == OK) {

diff --git a/uip/msh.c b/uip/msh.c
index 80bc1d21942507d6e31707a2a5d9ab6c684d2612..03584f6d3119eb5b538482c476a7dd729f6d409f 100644 (file)
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -801,10 +801,10 @@ m_gMsgs (int n)
 FILE *
 msh_ready (int msgnum, int full)
 {
 FILE *
 msh_ready (int msgnum, int full)
 {

-    NMH_UNUSED (full);

     register int msgp;
     int fd;
     char *cp;
     register int msgp;
     int fd;
     char *cp;

+    NMH_UNUSED (full);

 
     if (yp) {
        fclose (yp);
 
     if (yp) {
        fclose (yp);

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 9937a1dd31b73726ad5d58dacc15beb8c47325d1..b5debff9695e7aac9fe4eba0210c40a7717a1414 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -1075,9 +1075,8 @@ static char *hlpmsg[] = {
 void
 helpcmd (char **args)
 {
 void
 helpcmd (char **args)
 {

-    NMH_UNUSED (args);
-

     int i;
     int i;

+    NMH_UNUSED (args);

 
     for (i = 0; hlpmsg[i]; i++) {
        printf (hlpmsg[i], invo_name);
 
     for (i = 0; hlpmsg[i]; i++) {
        printf (hlpmsg[i], invo_name);

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 26401f4841d92d808a9d484debe9ce866655f2fe..b92c053a8bf07391cf24dd28f120bf89a5622d29 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -656,12 +656,11 @@ static int
 GREPaction (params)
 plist
 {
 GREPaction (params)
 plist
 {

-    NMH_UNUSED (msgnum);
-

     int c, body, lf;
     long pos = start;
     register char *p1, *p2, *ebp, *cbp;
     char ibuf[BUFSIZ];
     int c, body, lf;
     long pos = start;
     register char *p1, *p2, *ebp, *cbp;
     char ibuf[BUFSIZ];

+    NMH_UNUSED (msgnum);

 
     fseek (fp, start, SEEK_SET);
     body = 0;
 
     fseek (fp, start, SEEK_SET);
     body = 0;


@@ -931,12 +930,11 @@ static int
 TWSaction (params)
 plist
 {
 TWSaction (params)
 plist
 {

-    NMH_UNUSED (stop);
-

     int state;
     register char *bp;
     char buf[BUFSIZ], name[NAMESZ];
     register struct tws *tw;
     int state;
     register char *bp;
     char buf[BUFSIZ], name[NAMESZ];
     register struct tws *tw;

+    NMH_UNUSED (stop);

 
     fseek (fp, start, SEEK_SET);
     for (state = FLD, bp = NULL;;) {
 
     fseek (fp, start, SEEK_SET);
     for (state = FLD, bp = NULL;;) {

diff --git a/uip/popsbr.c b/uip/popsbr.c
index feb7aa0df429ce30b84e4941f5e5457ee63a849c..ff28705f07af58d4b3d931042279aaaca0f7f886 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -418,14 +418,13 @@ int
 pop_init (char *host, char *port, char *user, char *pass, char *proxy,
          int snoop, int sasl, char *mech)
 {
 pop_init (char *host, char *port, char *user, char *pass, char *proxy,
          int snoop, int sasl, char *mech)
 {

+    int fd1, fd2;
+    char buffer[BUFSIZ];

 #ifndef CYRUS_SASL
     NMH_UNUSED (sasl);
     NMH_UNUSED (mech);
 #endif /* ! CYRUS_SASL */
 
 #ifndef CYRUS_SASL
     NMH_UNUSED (sasl);
     NMH_UNUSED (mech);
 #endif /* ! CYRUS_SASL */
 

-    int fd1, fd2;
-    char buffer[BUFSIZ];
-

     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */
     if (proxy && *proxy) {
        int pid;
        int inpipe[2];    /* for reading from the server */

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 83f6ee8ecb3c5e70fb4e329b1ef3b937c333e6d9..8bf765e16cd204bfac53e79b6282cffd7e4de58a 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -71,8 +71,6 @@ void
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
        int mime, char *form, char *filter, char *fcc, int fmtproc)
 {
 replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
        int mime, char *form, char *filter, char *fcc, int fmtproc)
 {

-    NMH_UNUSED (msg);
-

     register int state, i;
     register struct comp *cptr;
     register char *tmpbuf;
     register int state, i;
     register struct comp *cptr;
     register char *tmpbuf;


@@ -83,6 +81,7 @@ replout (FILE *inb, char *msg, char *drft, struct msgs *mp, int outputlinelen,
     char name[NAMESZ], *scanl;
     unsigned char *cp;
     FILE *out;
     char name[NAMESZ], *scanl;
     unsigned char *cp;
     FILE *out;

+    NMH_UNUSED (msg);

 
     mask = umask(~m_gmprot());
     if ((out = fopen (drft, "w")) == NULL)
 
     mask = umask(~m_gmprot());
     if ((out = fopen (drft, "w")) == NULL)