[SCM] GNU Mailutils branch, master, updated. release-2.2-634-g49bebd5

[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=49bebd55339359bada765f66ac4ff99cd7cf51a4

The branch, master has been updated
       via  49bebd55339359bada765f66ac4ff99cd7cf51a4 (commit)
      from  6fad8e1734a83c273f6283436775a6548f9c941f (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 49bebd55339359bada765f66ac4ff99cd7cf51a4
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Nov 19 08:49:08 2012 +0200

    Minor fixes.
    
    * imap4d/imap4d.c: Avoid gcc warnings.
    * libmailutils/tests/imapio.c (main): Fix format specifier.
    * maidag/mailquota.c (dbm_retrieve_quota): Likewise.
    * mail/quit.c (mail_mbox_close): Likewise.
    * mail/mail.c (options): Fix improper initialization.
    * mu/mu.h (mu_getans): Add proto.
    * mu/util.c: Include netinet/in.h

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

Summary of changes:
 imap4d/imap4d.c             |    3 +++
 libmailutils/tests/imapio.c |    2 +-
 maidag/mailquota.c          |    6 +++---
 mail/mail.c                 |    2 +-
 mail/quit.c                 |    6 +++---
 mu/mu.h                     |    3 +++
 mu/util.c                   |    1 +
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index b90ff43..932e48d 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -589,6 +589,9 @@ imap4d_mainloop (int ifd, int ofd, enum tls_mode tls)
     case tls_no:
       imap4d_capability_remove (IMAP_CAPA_STARTTLS);
       tls_available = 0;
+      break;
+    default:
+      break;
     }
   
   session.tls_mode = tls;
diff --git a/libmailutils/tests/imapio.c b/libmailutils/tests/imapio.c
index 18405e2..52a88e3 100644
--- a/libmailutils/tests/imapio.c
+++ b/libmailutils/tests/imapio.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
       if (wc == 0)
        break;
 
-      mu_stream_printf (mu_strerr, "%d\n", wc);
+      mu_stream_printf (mu_strerr, "%lu\n", (unsigned long) wc);
       for (i = 0; i < wc; i++)
        {
          mu_stream_printf (mu_strerr, "%d: '%s'\n", i, wv[i]);
diff --git a/maidag/mailquota.c b/maidag/mailquota.c
index 3627404..3c4eb42 100644
--- a/maidag/mailquota.c
+++ b/maidag/mailquota.c
@@ -131,10 +131,10 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
       unlimited = 1;
   else if (contentd.mu_dsize > sizeof (buffer) - 1)
     {
-      mu_error (ngettext ("mailbox quota for `%s' is too big: %d digit",
-                         "mailbox quota for `%s' is too big: %d digits",
+      mu_error (ngettext ("mailbox quota for `%s' is too big: %lu digit",
+                         "mailbox quota for `%s' is too big: %lu digits",
                          contentd.mu_dsize),
-               name, contentd.mu_dsize);
+               name, (unsigned long) contentd.mu_dsize);
       *quota = groupquota;
     }
   else
diff --git a/mail/mail.c b/mail/mail.c
index aad4246..6a25de6 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -47,7 +47,7 @@ static struct argp_option options[] = {
   {"nosum",   'N', NULL,      0,
    N_("do not display initial header summary"), 0},
   {"print",   'p', NULL,      0, N_("print all mail to standard output"), 0},
-  {"read",    NULL, NULL,      OPTION_ALIAS },
+  {"read",    0,   NULL,      OPTION_ALIAS },
   {"return-address", 'r', N_("ADDRESS"), 0,
    N_("use address as the return address when sending mail"), 0},
   {"quit",    'q', NULL,      0,
diff --git a/mail/quit.c b/mail/quit.c
index f962876..2a81522 100644
--- a/mail/quit.c
+++ b/mail/quit.c
@@ -50,10 +50,10 @@ mail_mbox_close ()
   mu_mailbox_get_url (mbox, &url);
   mu_mailbox_messages_count (mbox, &held_count);
   mu_printf (
-           ngettext ("Held %d message in %s\n",
-                     "Held %d messages in %s\n",
+           ngettext ("Held %lu message in %s\n",
+                     "Held %lu messages in %s\n",
                      held_count),
-           held_count, util_url_to_string (url));
+           (unsigned long) held_count, util_url_to_string (url));
   mu_mailbox_close (mbox);
   mu_mailbox_destroy (&mbox);
   return 0;
diff --git a/mu/mu.h b/mu/mu.h
index 2c33f4b..a136073 100644
--- a/mu/mu.h
+++ b/mu/mu.h
@@ -61,3 +61,6 @@ int shell_verbose (int argc, char **argv,
 
 int get_bool (const char *str, int *pb);
 int get_port (const char *port_str, int *pn);
+
+int mu_getans (const char *variants, const char *fmt, ...);
+
diff --git a/mu/util.c b/mu/util.c
index c4b0d09..c18122e 100644
--- a/mu/util.c
+++ b/mu/util.c
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <mailutils/mailutils.h>
 #include "mu.h"
 


hooks/post-receive
-- 
GNU Mailutils