Commit 49bebd55 49bebd55339359bada765f66ac4ff99cd7cf51a4 by Sergey Poznyakoff

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
1 parent 6fad8e17
......@@ -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;
......
......@@ -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]);
......
......@@ -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
......
......@@ -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,
......
......@@ -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;
......
......@@ -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, ...);
......
......@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <arpa/inet.h>
#include <netinet/in.h>
#include <mailutils/mailutils.h>
#include "mu.h"
......