[SCM] GNU Mailutils branch, master, updated. rel-2_1-32-g5f97b64

[Sergey Poznyakoff]

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 "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=5f97b64945c9be3f50ca7ffc664ff87a08bd7a9b

The branch, master has been updated
       via  5f97b64945c9be3f50ca7ffc664ff87a08bd7a9b (commit)
       via  58e8f4267dce75055f074a02afcc98df1d1e5cea (commit)
      from  5d370760311aaa86a16ab5bab166d9d339104cd3 (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 -----------------------------------------------------------------
commit 5f97b64945c9be3f50ca7ffc664ff87a08bd7a9b
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Feb 9 13:09:58 2010 +0200

    Fix improperly placed variable declarations.
    
    * imap4d/id.c
    * libproto/imap/folder.c
    * libproto/pop/mbox.c
    * sieve/sieve.c

commit 58e8f4267dce75055f074a02afcc98df1d1e5cea
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Feb 9 13:08:30 2010 +0200

    Minor fix.
    
    * sieve/testsuite/sieve/ext.exp [!HAVE_LIBLTDL]: Use unsupported
    instead of returning 0.

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

Summary of changes:
 imap4d/id.c                   |    2 +-
 libproto/imap/folder.c        |    6 ++++--
 libproto/pop/mbox.c           |    4 +++-
 sieve/sieve.c                 |    4 +++-
 sieve/testsuite/sieve/ext.exp |    9 ++++-----
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/imap4d/id.c b/imap4d/id.c
index 39105d0..f8c261c 100644
--- a/imap4d/id.c
+++ b/imap4d/id.c
@@ -173,10 +173,10 @@ imap4d_id (struct imap4d_command *command, 
imap4d_tokbuf_t tok)
   if (imap4d_id_list)
     {
       mu_iterator_t itr;
-      mu_list_get_iterator (imap4d_id_list, &itr);
       int i;
       int outcnt = 0;
       
+      mu_list_get_iterator (imap4d_id_list, &itr);
       for (i = 0, mu_iterator_first (itr);
           i < 30 && !mu_iterator_is_done (itr);
           i++, mu_iterator_next (itr))
diff --git a/libproto/imap/folder.c b/libproto/imap/folder.c
index 215cfc7..77e7919 100644
--- a/libproto/imap/folder.c
+++ b/libproto/imap/folder.c
@@ -574,10 +574,12 @@ static int
 imap_writer (void *iodata, char *buf)
 {
   f_imap_t iop = iodata;
+  int status;
+    
   MU_DEBUG2 (iop->folder->debug, MU_DEBUG_PROT, "g%lu %s\n",
              (unsigned long)iop->seq, buf);
-  int status = imap_writeline (iop, "g%lu %s\r\n",
-                               (unsigned long)iop->seq++, buf);
+  status = imap_writeline (iop, "g%lu %s\r\n",
+                          (unsigned long)iop->seq++, buf);
   CHECK_ERROR (iop, status);
   status = imap_send (iop);
   CHECK_ERROR (iop, status);
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 7cbe08c..a9e28d5 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -729,8 +729,10 @@ static int
 pop_writer (void *iodata, char *buf)
 {
   pop_data_t iop = iodata;
+  int status;
+  
   MU_DEBUG1 (iop->mbox->debug, MU_DEBUG_PROT, "%s\n", buf);
-  int status = pop_writeline (iop, "%s\r\n", buf);
+  status = pop_writeline (iop, "%s\r\n", buf);
   CHECK_ERROR (iop, status);
   status = pop_write (iop);
   CHECK_ERROR (iop, status);
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 5cb55f8..c02b5d8 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -271,9 +271,11 @@ cb_debug (mu_debug_t debug, void *data, mu_config_value_t 
*val)
 static int
 cb_email (mu_debug_t debug, void *data, mu_config_value_t *val)
 {
+  int rc;
+  
   if (mu_cfg_assert_value_type (val, MU_CFG_STRING, debug))
     return 1;
-  int rc = mu_set_user_email (val->v.string);
+  rc = mu_set_user_email (val->v.string);
   if (rc)
     mu_cfg_format_error (debug, MU_DEBUG_ERROR, _("invalid email: %s"),
                         mu_strerror (rc));
diff --git a/sieve/testsuite/sieve/ext.exp b/sieve/testsuite/sieve/ext.exp
index 3afcff8..ac34c44 100644
--- a/sieve/testsuite/sieve/ext.exp
+++ b/sieve/testsuite/sieve/ext.exp
@@ -19,10 +19,9 @@
 
 mu_version
 if ![mu_check_capability HAVE_LIBLTDL] {
-    exit 0
-}
-
-sieve_test --clearpath -L "${top_builddir}/examples" -f 
${MU_SPOOL_DIR}/bigto.mbox numaddr.sv -pattern \
+    unsupported "This test requires libltdl"
+} else {
+    sieve_test --clearpath -L "${top_builddir}/examples" -f 
${MU_SPOOL_DIR}/bigto.mbox numaddr.sv -pattern \
        "DISCARD on msg uid 1: marking as deleted"
-
+}
 # End of ext.exp


hooks/post-receive
-- 
GNU Mailutils