[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. f311d0371d3585ad4f97a69de9669dd49197686a

[Ken Hornstein]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  f311d0371d3585ad4f97a69de9669dd49197686a (commit)
       via  fc6817f4dcebc81838636ab6dd01f945b80bac2a (commit)
       via  01ccb3f07cef6989517ff99252ca00b0e1c1c07c (commit)
      from  12c2591c4b575e04907125bab5bcc5561d45efb5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=f311d0371d3585ad4f97a69de9669dd49197686a


commit f311d0371d3585ad4f97a69de9669dd49197686a
Author: Ken Hornstein <address@hidden>
Date:   Thu Mar 15 13:55:15 2012 -0400

    Clean up prototypes.

diff --git a/h/msh.h b/h/msh.h
index fb80f23..433be00 100644
--- a/h/msh.h
+++ b/h/msh.h
@@ -53,7 +53,7 @@ extern int modified;          /* command modified folder */
 extern struct msgs *mp;                /* used a lot              */
 extern struct Msg *Msgs;       /* Msgs[0] not used        */
 
-FILE *msh_ready ();
+FILE *msh_ready (int, int);
 
 /*
  * COMMAND
diff --git a/uip/msh.c b/uip/msh.c
index f6d1a36..7b5575e 100644
--- a/uip/msh.c
+++ b/uip/msh.c
@@ -155,7 +155,6 @@ int told_to_quit;           /* SIGQUIT detected */
  */
 void fsetup (char *);
 void setup (char *);
-FILE *msh_ready (int, int);
 void readids (int);
 int readid (int);
 void display_info (int);
@@ -174,7 +173,6 @@ static int read_map (char *, long);
 static int read_file (long, int);
 
 static void m_gMsgs (int);
-FILE *msh_ready (int, int);
 static int check_folder (int);
 static void scanrange (int, int);
 static void scanstring (char *);
diff --git a/uip/picksbr.c b/uip/picksbr.c
index 85bc4bc..26401f4 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -175,23 +175,23 @@ static struct nexus *head;
 /*
  * prototypes for date routines
  */
-static struct tws *tws_parse();
-static struct tws *tws_special();
+static struct tws *tws_parse(char *, int);
+static struct tws *tws_special(char *);
 
 /*
  * static prototypes
  */
-static void PRaction();
-static int gcompile();
-static int advance();
-static int cclass();
-static int tcompile();
-
-static struct nexus *parse();
-static struct nexus *nexp1();
-static struct nexus *nexp2();
-static struct nexus *nexp3();
-static struct nexus *newnexus();
+static void PRaction(struct nexus *, int);
+static int gcompile(struct nexus *, char *);
+static int advance(char *, char *);
+static int cclass(unsigned char *, int, int);
+static int tcompile(char *, struct tws *, int);
+
+static struct nexus *parse(void);
+static struct nexus *nexp1(void);
+static struct nexus *nexp2(void);
+static struct nexus *nexp3(void);
+static struct nexus *newnexus(int (*)());
 
 static int ORaction();
 static int ANDaction();

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=fc6817f4dcebc81838636ab6dd01f945b80bac2a


commit fc6817f4dcebc81838636ab6dd01f945b80bac2a
Author: Ken Hornstein <address@hidden>
Date:   Thu Mar 15 13:04:38 2012 -0400

    Fix some warnings.

diff --git a/test/fakesmtp.c b/test/fakesmtp.c
index 19df2e9..700bc45 100644
--- a/test/fakesmtp.c
+++ b/test/fakesmtp.c
@@ -240,7 +240,7 @@ static int
 getsmtp(int socket, char *data)
 {
        int cc;
-       static int bytesinbuf = 0;
+       static unsigned int bytesinbuf = 0;
        static char buffer[LINESIZE * 2], *p;
 
        for (;;) {
@@ -294,6 +294,8 @@ getsmtp(int socket, char *data)
 static void
 handleterm(int signal)
 {
+       (void) signal;
+
        killpidfile();
        fflush(NULL);
        _exit(1);

http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=01ccb3f07cef6989517ff99252ca00b0e1c1c07c


commit 01ccb3f07cef6989517ff99252ca00b0e1c1c07c
Author: Ken Hornstein <address@hidden>
Date:   Thu Mar 15 11:55:34 2012 -0400

    I guess the -i option to sed works differently on Linux and MacOS
    X; deal with it.

diff --git a/test/post/test-post-common.sh b/test/post/test-post-common.sh
index 7698b81..c35a5a2 100755
--- a/test/post/test-post-common.sh
+++ b/test/post/test-post-common.sh
@@ -37,7 +37,9 @@ test_post ()
     # compare it against our "correct" output.
     #
 
-    sed -i "" -e 's/^Date:.*/Date:/' "$1"
+    sed -i.bak -e 's/^Date:.*/Date:/' "$1"
+
+    rm -f "${1}.bak"
 
     check "$1" "$2"
 }
diff --git a/test/post/test-post-fcc b/test/post/test-post-fcc
index b8a9419..5ade972 100755
--- a/test/post/test-post-fcc
+++ b/test/post/test-post-fcc
@@ -54,8 +54,10 @@ EOF
 
 msgname=$(mhpath +inbox 11)
 
-sed -i "" -e 's/^Date:.*/Date:/' ${msgname}
+sed -i.bak -e 's/^Date:.*/Date:/' "${msgname}"
 
-check "${testname}.msg.expected" ${msgname}
+rm -f "${msgname}.bak"
+
+check "${testname}.msg.expected" "${msgname}"
 
 exit ${failed:-0}

-----------------------------------------------------------------------

Summary of changes:
 h/msh.h                       |    2 +-
 test/fakesmtp.c               |    4 +++-
 test/post/test-post-common.sh |    4 +++-
 test/post/test-post-fcc       |    6 ++++--
 uip/msh.c                     |    2 --
 uip/picksbr.c                 |   26 +++++++++++++-------------
 6 files changed, 24 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System