[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. rel-2_1-9-g4f36463
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. rel-2_1-9-g4f36463 |
|
Date: |
Sun, 25 Oct 2009 16:53:06 +0000 |
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=4f36463dfe2d17b2932a656fffee9aeb7832abe4
The branch, master has been updated
via 4f36463dfe2d17b2932a656fffee9aeb7832abe4 (commit)
via f0cc7bda9699c31f2c478928f78b16876db2fa25 (commit)
from 50da8665bad9738fb69f603d9d7d0d2f52d0c0fa (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 4f36463dfe2d17b2932a656fffee9aeb7832abe4
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Oct 25 18:52:41 2009 +0200
Variois fixes (mostly to placate gcc)
* examples/base64.c, examples/mta.c,
imap4d/auth_gss.c, imap4d/imap4d.c,
imap4d/preauth.c, libmu_auth/ldap.c,
libmu_auth/virtual.c, libmu_scm/mu_body.c,
libmu_scm/mu_port.c, libproto/mailer/smtp.c,
mailbox/acl.c, mailbox/secret.c, pop3d/pop3d.c,
python/libmu_py/address.c, sql/odbc.c: Fix argument
signedness.
* imap4d/fetch.c, imap4d/store.c (closures):
Change type of `count' to int, to match the
signature of util_msgset.
* include/mailutils/guile.h (mu_scm_message_get): Fix
return type (const is useless here).
* libmu_scm/mu_message.c (mu_scm_message_get): Likewise.
(scm_mu_message_copy): Fix type of the `wr' automatic variable.
* libmu_scm/mu_mime.c (mu_scm_mime_get): Remove const qualifier
from the return type.
* libmu_argp/cmdline.c: Include stdlib.h.
commit f0cc7bda9699c31f2c478928f78b16876db2fa25
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Oct 25 18:51:51 2009 +0200
Bugfixes.
* mailbox/assoc.c (assoc_remove): Fix incorrect copying
between assoc slots.
* mailbox/cfg_parser.y (STRTONUM): Remove useless
dereferencing. Change the loop from `while' to `for'.
-----------------------------------------------------------------------
Summary of changes:
examples/base64.c | 5 +-
examples/mta.c | 3 +-
imap4d/auth_gss.c | 10 +-
imap4d/fetch.c | 2 +-
imap4d/imap4d.c | 2 +-
imap4d/preauth.c | 14 ++--
imap4d/store.c | 2 +-
include/mailutils/guile.h | 2 +-
libmu_argp/cmdline.c | 1 +
libmu_auth/ldap.c | 13 +--
libmu_auth/virtual.c | 2 +-
libmu_scm/mu_body.c | 2 +-
libmu_scm/mu_message.c | 4 +-
libmu_scm/mu_mime.c | 2 +-
libmu_scm/mu_port.c | 5 +-
libproto/mailer/smtp.c | 12 +-
mailbox/acl.c | 2 +-
mailbox/assoc.c | 4 +-
mailbox/cfg_parser.y | 241 ++++++++++++++++++++++-----------------------
mailbox/secret.c | 2 +-
pop3d/pop3d.c | 2 +-
python/libmu_py/address.c | 3 +-
sql/odbc.c | 12 +-
23 files changed, 177 insertions(+), 170 deletions(-)
diff --git a/examples/base64.c b/examples/base64.c
index 6c8e0b5..0cc1bc3 100644
--- a/examples/base64.c
+++ b/examples/base64.c
@@ -94,7 +94,8 @@ main (int argc, char * argv [])
MU_ASSERT (mu_stdio_stream_create (&out, stdout, 0));
MU_ASSERT (mu_stream_open (out));
- while (mu_stream_read (flt, &buffer, sizeof (buffer), total, &size) == 0
+ while (mu_stream_read (flt, (char*) &buffer,
+ sizeof (buffer), total, &size) == 0
&& size > 0)
{
if (printable && !ISPRINT (buffer))
@@ -104,7 +105,7 @@ main (int argc, char * argv [])
mu_stream_sequential_write (out, outbuf, strlen (outbuf));
}
else
- mu_stream_sequential_write (out, &buffer, size);
+ mu_stream_sequential_write (out, (char*) &buffer, size);
total += size;
}
diff --git a/examples/mta.c b/examples/mta.c
index 226aab2..f919b30 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -803,7 +803,8 @@ mta_smtp (int argc, char **argv)
{
fd_set rfds;
struct sockaddr_in his_addr;
- int sfd, len, status;
+ int sfd, status;
+ socklen_t len;
FD_ZERO (&rfds);
FD_SET (fd, &rfds);
diff --git a/imap4d/auth_gss.c b/imap4d/auth_gss.c
index 98f8a77..40c6f16 100644
--- a/imap4d/auth_gss.c
+++ b/imap4d/auth_gss.c
@@ -114,7 +114,7 @@ auth_gssapi (struct imap4d_command *command,
{
gss_buffer_desc tokbuf, outbuf;
OM_uint32 maj_stat, min_stat, min_stat2;
- OM_uint32 cflags;
+ int cflags;
OM_uint32 sec_level, mech;
gss_ctx_id_t context;
gss_cred_id_t cred_handle, server_creds;
@@ -170,8 +170,10 @@ auth_gssapi (struct imap4d_command *command,
for (;;)
{
+ OM_uint32 ret_flags;
+
imap4d_getline (&token_str, &token_size, &token_len);
- mu_base64_decode (token_str, token_len, &tmp, &size);
+ mu_base64_decode ((unsigned char*) token_str, token_len, &tmp, &size);
tokbuf.value = tmp;
tokbuf.length = size;
@@ -183,7 +185,7 @@ auth_gssapi (struct imap4d_command *command,
&client,
&mech_type,
&outbuf,
- &cflags, NULL, &cred_handle);
+ &ret_flags, NULL, &cred_handle);
free (tmp);
if (maj_stat == GSS_S_CONTINUE_NEEDED)
{
@@ -234,7 +236,7 @@ auth_gssapi (struct imap4d_command *command,
free (tmp);
imap4d_getline (&token_str, &token_size, &token_len);
- mu_base64_decode (token_str, token_len,
+ mu_base64_decode ((unsigned char *) token_str, token_len,
(unsigned char **) &tokbuf.value, &tokbuf.length);
free (token_str);
diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index 2d1b939..16caf33 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.c
@@ -63,7 +63,7 @@ struct fetch_parse_closure
int isuid;
mu_list_t fnlist;
size_t *set;
- size_t count;
+ int count;
};
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 300d0ce..19e2e92 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -412,7 +412,7 @@ imap4d_session_setup (char *username)
int
get_client_address (int fd, struct sockaddr_in *pcs)
{
- int len = sizeof *pcs;
+ socklen_t len = sizeof *pcs;
if (getpeername (fd, (struct sockaddr *) pcs, &len) < 0)
{
diff --git a/imap4d/preauth.c b/imap4d/preauth.c
index b1b44d0..808a0c1 100644
--- a/imap4d/preauth.c
+++ b/imap4d/preauth.c
@@ -141,7 +141,7 @@ des_cbc_cksum (gl_des_ctx *ctx, unsigned char *buf, size_t
bufsize,
}
bufsize = 0;
}
- gl_des_ecb_crypt (ctx, key, key, 0);
+ gl_des_ecb_crypt (ctx, (char*) key, (char*) key, 0);
}
}
@@ -194,8 +194,8 @@ des_string_to_key (char *buf, size_t bufsize, unsigned char
key[8])
}
des_fixup_key_parity (key);
- gl_des_setkey (&context, key);
- des_cbc_cksum (&context, buf, bufsize, key, key);
+ gl_des_setkey (&context, (char*) key);
+ des_cbc_cksum (&context, (unsigned char*) buf, bufsize, key, key);
memset (&context, 0, sizeof context);
des_fixup_key_parity (key);
}
@@ -215,7 +215,7 @@ decode64_buf (const char *name, unsigned char **pbuf,
size_t *psize)
MU_STREAM_READ | MU_STREAM_NO_CHECK);
mu_stream_open (str);
mu_stream_sequential_write (str, name, namelen);
- mu_stream_read (flt, buf, sizeof buf, 0, &size);
+ mu_stream_read (flt, (char*) buf, sizeof buf, 0, &size);
mu_stream_destroy (&flt, NULL);
mu_stream_destroy (&str, NULL);
*pbuf = malloc (size);
@@ -281,7 +281,7 @@ ident_decrypt (const char *file, const char *name)
gl_des_ctx ctx;
des_string_to_key (keybuf, sizeof (keybuf), key);
- gl_des_setkey (&ctx, key);
+ gl_des_setkey (&ctx, (char*) key);
memcpy (id.chars, buf, size);
@@ -469,9 +469,9 @@ int
imap4d_preauth_setup (int fd)
{
struct sockaddr clt_sa, *pclt_sa;
- int clt_len = sizeof clt_sa;
+ socklen_t clt_len = sizeof clt_sa;
struct sockaddr srv_sa, *psrv_sa;
- int srv_len = sizeof srv_sa;
+ socklen_t srv_len = sizeof srv_sa;
char *username = NULL;
if (getsockname (fd, &srv_sa, &srv_len) == -1)
diff --git a/imap4d/store.c b/imap4d/store.c
index c4839a3..75c3023 100644
--- a/imap4d/store.c
+++ b/imap4d/store.c
@@ -28,7 +28,7 @@ struct store_parse_closure
int type;
int isuid;
size_t *set;
- size_t count;
+ int count;
};
static int
diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h
index eac946a..e2e233f 100644
--- a/include/mailutils/guile.h
+++ b/include/mailutils/guile.h
@@ -54,7 +54,7 @@ extern int mu_scm_is_mailbox (SCM scm);
extern void mu_scm_message_init (void);
extern SCM mu_scm_message_create (SCM owner, mu_message_t msg);
extern int mu_scm_is_message (SCM scm);
-extern const mu_message_t mu_scm_message_get (SCM MESG);
+extern mu_message_t mu_scm_message_get (SCM MESG);
extern int mu_scm_is_body (SCM scm);
extern void mu_scm_body_init (void);
diff --git a/libmu_argp/cmdline.c b/libmu_argp/cmdline.c
index 0cdd81e..d5e835b 100644
--- a/libmu_argp/cmdline.c
+++ b/libmu_argp/cmdline.c
@@ -19,6 +19,7 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
+#include <stdlib.h>
#include "cmdline.h"
static struct mu_cmdline_capa *all_cmdline_capa[] = {
diff --git a/libmu_auth/ldap.c b/libmu_auth/ldap.c
index 74c4e02..772701d 100644
--- a/libmu_auth/ldap.c
+++ b/libmu_auth/ldap.c
@@ -130,7 +130,7 @@ _mu_conn_setup (LDAP **pld)
/* if no host but a DN is provided, try DNS SRV to gather the
host list */
char *domain = NULL, *hostlist = NULL, **hosts = NULL;
- size_t hostcnt;
+ int hostcnt;
int i;
int len_proto = strlen(lud->lud_scheme);
@@ -319,8 +319,7 @@ _mu_ldap_bind (LDAP *ld)
|| refs)
{
/* FIXME: Use mu_debug_t for that */
- mu_error ("ldap_bind: %s (%d)%s",
- ldap_err2string (err), err, msgbuf ? msgbuf : "");
+ mu_error ("ldap_bind: %s (%d)%s", ldap_err2string (err), err, msgbuf);
if (matched && *matched)
mu_error ("matched DN: %s", matched);
@@ -600,7 +599,7 @@ chk_md5 (const char *db_pass, const char *pass)
mu_stream_open (str);
mu_stream_sequential_write (str, db_pass, strlen (db_pass));
- mu_stream_read (flt, d1, sizeof d1, 0, NULL);
+ mu_stream_read (flt, (char*) d1, sizeof d1, 0, NULL);
mu_stream_destroy (&flt, NULL);
mu_stream_destroy (&str, NULL);
@@ -633,7 +632,7 @@ chk_smd5 (const char *db_pass, const char *pass)
return ENOMEM;
}
- mu_stream_read (flt, d1, size, 0, &size);
+ mu_stream_read (flt, (char*) d1, size, 0, &size);
mu_stream_destroy (&flt, NULL);
mu_stream_destroy (&str, NULL);
@@ -672,7 +671,7 @@ chk_sha (const char *db_pass, const char *pass)
mu_stream_open (str);
mu_stream_sequential_write (str, db_pass, strlen (db_pass));
- mu_stream_read (flt, d1, sizeof d1, 0, NULL);
+ mu_stream_read (flt, (char*) d1, sizeof d1, 0, NULL);
mu_stream_destroy (&flt, NULL);
mu_stream_destroy (&str, NULL);
@@ -705,7 +704,7 @@ chk_ssha (const char *db_pass, const char *pass)
return ENOMEM;
}
- mu_stream_read (flt, d1, size, 0, &size);
+ mu_stream_read (flt, (char*) d1, size, 0, &size);
mu_stream_destroy (&flt, NULL);
mu_stream_destroy (&str, NULL);
diff --git a/libmu_auth/virtual.c b/libmu_auth/virtual.c
index 40998ee..8e1185f 100644
--- a/libmu_auth/virtual.c
+++ b/libmu_auth/virtual.c
@@ -116,7 +116,7 @@ getpwnam_ip_virtual (const char *u)
{
struct sockaddr_in addr;
struct passwd *pw = NULL;
- int len = sizeof (addr);
+ socklen_t len = sizeof (addr);
if (getsockname (0, (struct sockaddr *)&addr, &len) == 0)
{
diff --git a/libmu_scm/mu_body.c b/libmu_scm/mu_body.c
index 7a4f8ca..1bb2d85 100644
--- a/libmu_scm/mu_body.c
+++ b/libmu_scm/mu_body.c
@@ -108,7 +108,7 @@ SCM_DEFINE (scm_mu_body_read_line, "mu-body-read-line", 1,
0, 0,
#define FUNC_NAME s_scm_mu_body_read_line
{
struct mu_body *mbp;
- int n, nread;
+ size_t n, nread;
int status;
SCM_ASSERT (mu_scm_is_body (BODY), BODY, SCM_ARG1, FUNC_NAME);
diff --git a/libmu_scm/mu_message.c b/libmu_scm/mu_message.c
index 7d9b363..b74ce16 100644
--- a/libmu_scm/mu_message.c
+++ b/libmu_scm/mu_message.c
@@ -168,7 +168,7 @@ mu_scm_message_add_owner (SCM MESG, SCM owner)
mum->mbox = cell;
}
-const mu_message_t
+mu_message_t
mu_scm_message_get (SCM MESG)
{
struct mu_message *mum = (struct mu_message *) SCM_CDR (MESG);
@@ -234,7 +234,7 @@ SCM_DEFINE (scm_mu_message_copy, "mu-message-copy", 1, 0, 0,
== 0
&& n != 0)
{
- int wr;
+ size_t wr;
int rc;
rc = mu_stream_write (out, buffer, n, off, &wr);
diff --git a/libmu_scm/mu_mime.c b/libmu_scm/mu_mime.c
index 013c88a..764bb1d 100644
--- a/libmu_scm/mu_mime.c
+++ b/libmu_scm/mu_mime.c
@@ -72,7 +72,7 @@ mu_scm_mime_create (SCM owner, mu_mime_t mime)
SCM_RETURN_NEWSMOB (mime_tag, mum);
}
-const mu_mime_t
+mu_mime_t
mu_scm_mime_get (SCM MIME)
{
struct mu_mime *mum = (struct mu_mime *) SCM_CDR (MIME);
diff --git a/libmu_scm/mu_port.c b/libmu_scm/mu_port.c
index c9ed35c..a87cf9e 100644
--- a/libmu_scm/mu_port.c
+++ b/libmu_scm/mu_port.c
@@ -121,7 +121,8 @@ mu_port_flush (SCM port)
if (wrsize)
{
- if (mu_stream_write (mp->stream, pt->write_buf, wrsize, mp->offset, &n))
+ if (mu_stream_write (mp->stream, (char*) pt->write_buf,
+ wrsize, mp->offset, &n))
return;
mp->offset += n;
}
@@ -162,7 +163,7 @@ mu_port_fill_input (SCM port)
size_t nread = 0;
int status;
- status = mu_stream_read (mp->stream, pt->read_buf, pt->read_buf_size,
+ status = mu_stream_read (mp->stream, (char*) pt->read_buf, pt->read_buf_size,
mp->offset, &nread);
if (status)
mu_scm_error ("mu_port_fill_input", status,
diff --git a/libproto/mailer/smtp.c b/libproto/mailer/smtp.c
index e6e7bf7..752198d 100644
--- a/libproto/mailer/smtp.c
+++ b/libproto/mailer/smtp.c
@@ -632,7 +632,7 @@ smtp_starttls (smtp_t smtp)
}
static void
-cram_md5 (char *secret, char *challenge, unsigned char *digest)
+cram_md5 (char *secret, unsigned char *challenge, unsigned char *digest)
{
struct mu_md5_ctx context;
unsigned char ipad[64];
@@ -645,7 +645,7 @@ cram_md5 (char *secret, char *challenge, unsigned char
*digest)
return;
secret_len = strlen (secret);
- challenge_len = strlen (challenge);
+ challenge_len = strlen ((char*) challenge);
memset (ipad, 0, sizeof (ipad));
memset (opad, 0, sizeof (opad));
@@ -670,7 +670,7 @@ cram_md5 (char *secret, char *challenge, unsigned char
*digest)
mu_md5_init_ctx (&context);
mu_md5_process_bytes (ipad, sizeof (ipad), &context);
- mu_md5_process_bytes ((unsigned char *) challenge, challenge_len, &context);
+ mu_md5_process_bytes (challenge, challenge_len, &context);
mu_md5_finish_ctx (&context, digest);
mu_md5_init_ctx (&context);
@@ -766,7 +766,7 @@ smtp_auth (smtp_t smtp)
p = strchr (smtp->buffer, ' ') + 1;
mu_rtrim_cset (p, "\r\n");
- mu_base64_decode (p, strlen (p), &chl, &chlen);
+ mu_base64_decode ((unsigned char*) p, strlen (p), &chl, &chlen);
cram_md5 ((char *) mu_secret_password (secret), chl, digest);
mu_secret_password_unref (secret);
@@ -777,7 +777,7 @@ smtp_auth (smtp_t smtp)
mu_asnprintf (&buf, &buflen, "%s %s", user, ascii_digest);
buflen = strlen (buf);
- mu_base64_encode (buf, buflen, &b64buf, &b64buflen);
+ mu_base64_encode ((unsigned char*) buf, buflen, &b64buf, &b64buflen);
b64buf[b64buflen] = '\0';
free (buf);
@@ -819,7 +819,7 @@ smtp_auth (smtp_t smtp)
if (buf[c] == '^')
buf[c] = '\0';
}
- mu_base64_encode (buf, buflen, &b64buf, &b64buflen);
+ mu_base64_encode ((unsigned char*) buf, buflen, &b64buf, &b64buflen);
b64buf[b64buflen] = '\0';
free (buf);
diff --git a/mailbox/acl.c b/mailbox/acl.c
index 42d89a9..7dc5e3e 100644
--- a/mailbox/acl.c
+++ b/mailbox/acl.c
@@ -766,7 +766,7 @@ int
mu_acl_check_fd (mu_acl_t acl, int fd, mu_acl_result_t *pres)
{
struct sockaddr_in cs;
- int len = sizeof cs;
+ socklen_t len = sizeof cs;
if (getpeername (fd, (struct sockaddr *) &cs, &len) < 0)
{
diff --git a/mailbox/assoc.c b/mailbox/assoc.c
index 4829d3b..1dc6a73 100644
--- a/mailbox/assoc.c
+++ b/mailbox/assoc.c
@@ -173,7 +173,9 @@ assoc_remove (mu_assoc_t assoc, struct _mu_assoc_elem *elem)
}
while ((j < r && r <= i) || (i < j && j < r) || (r <= i && i < j));
- *ASSOC_ELEM (assoc, j) = *ASSOC_ELEM (assoc, i);
+ if (j != i)
+ memcpy (ASSOC_ELEM (assoc, j), ASSOC_ELEM (assoc, i),
+ assoc->elsize);
}
return 0;
}
diff --git a/mailbox/cfg_parser.y b/mailbox/cfg_parser.y
index 559609f..d552bcb 100644
--- a/mailbox/cfg_parser.y
+++ b/mailbox/cfg_parser.y
@@ -1,5 +1,5 @@
%{
-/* cfg_parser.y -- general-purpose configuration file parser
+/* cfg_parser.y -- general-purpose configuration file parser
Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
GNU Mailutils is free software; you can redistribute it and/or
@@ -20,29 +20,29 @@
#endif
#include <stdio.h>
#include <stdlib.h>
-#include <stdarg.h>
+#include <stdarg.h>
#include <string.h>
#include <netdb.h>
#include "intprops.h"
#include <mailutils/nls.h>
#include <mailutils/cfg.h>
-#include <mailutils/alloc.h>
+#include <mailutils/alloc.h>
#include <mailutils/errno.h>
#include <mailutils/error.h>
#include <mailutils/list.h>
-#include <mailutils/iterator.h>
+#include <mailutils/iterator.h>
#include <mailutils/debug.h>
-
+
int mu_cfg_parser_verbose;
static mu_cfg_node_t *parse_tree;
mu_cfg_locus_t mu_cfg_locus;
size_t mu_cfg_error_count;
-
+
static int _mu_cfg_errcnt;
static mu_debug_t _mu_cfg_debug;
int yylex ();
-
+
void _mu_line_begin (void);
void _mu_line_add (char *text, size_t len);
char *_mu_line_finish (void);
@@ -62,12 +62,12 @@ config_value_dup (mu_config_value_t *src)
else
{
/* FIXME: Use mu_opool_alloc */
- mu_config_value_t *val = mu_alloc (sizeof (*val));
+ mu_config_value_t *val = mu_alloc (sizeof (*val));
*val = *src;
return val;
}
}
-
+
static mu_cfg_node_t *
mu_cfg_alloc_node (enum mu_cfg_node_type type, mu_cfg_locus_t *loc,
const char *tag, mu_config_value_t *label,
@@ -92,7 +92,7 @@ void
mu_cfg_format_error (mu_debug_t debug, size_t level, const char *fmt, ...)
{
va_list ap;
-
+
if (!debug)
mu_diag_get_debug (&debug);
va_start (ap, fmt);
@@ -101,7 +101,7 @@ mu_cfg_format_error (mu_debug_t debug, size_t level, const
char *fmt, ...)
va_end (ap);
if (level <= MU_DEBUG_ERROR)
mu_cfg_error_count++;
-}
+}
static void
_mu_cfg_debug_set_locus (mu_debug_t debug, const mu_cfg_locus_t *loc)
@@ -128,7 +128,7 @@ _mu_cfg_perror (mu_debug_t debug, const mu_cfg_locus_t *loc,
const char *fmt, ...)
{
va_list ap;
-
+
va_start (ap, fmt);
_mu_cfg_vperror (debug, loc, fmt, ap);
va_end (ap);
@@ -138,7 +138,7 @@ void
mu_cfg_perror (const mu_cfg_locus_t *loc, const char *fmt, ...)
{
va_list ap;
-
+
va_start (ap, fmt);
_mu_cfg_vperror (_mu_cfg_debug, loc, fmt, ap);
va_end (ap);
@@ -163,11 +163,11 @@ debug_print_node (mu_cfg_node_t *node)
"statement: %s, id: %s",
node_type_str (node->type),
node->tag ? node->tag : "(null)");
-
+
mu_debug_set_locus (_mu_cfg_debug, NULL, 0);
}
}
-
+
%}
%union {
@@ -183,7 +183,7 @@ debug_print_node (mu_cfg_node_t *node)
%token <string> MU_TOK_IDENT MU_TOK_STRING MU_TOK_QSTRING MU_TOK_MSTRING
%type <string> string slist
%type <list> slist0
-%type <value> value
+%type <value> value
%type <pvalue> tag vallist
%type <list> values list vlist
%type <ident> ident
@@ -193,69 +193,69 @@ debug_print_node (mu_cfg_node_t *node)
%%
input : stmtlist
- {
+ {
parse_tree = $1.head;
- }
- ;
+ }
+ ;
stmtlist: stmt
- {
+ {
$$.head = $$.tail = $1;
debug_print_node ($1);
}
- | stmtlist stmt
- {
+ | stmtlist stmt
+ {
$$ = $1;
$$.tail->next = $2;
$$.tail = $2;
debug_print_node ($2);
}
- ;
+ ;
stmt : simple
- | block
- ;
+ | block
+ ;
simple : ident vallist ';'
- {
+ {
$$ = mu_cfg_alloc_node (mu_cfg_node_param, &$1.locus,
$1.name, $2,
NULL);
}
- ;
+ ;
block : ident tag '{' '}' opt_sc
- {
+ {
$$ = mu_cfg_alloc_node (mu_cfg_node_tag, &$1.locus,
$1.name, $2,
NULL);
-
+
}
- | ident tag '{' stmtlist '}' opt_sc
+ | ident tag '{' stmtlist '}' opt_sc
{
$$ = mu_cfg_alloc_node (mu_cfg_node_tag, &$1.locus,
$1.name, $2,
$4.head);
-
+
}
- ;
+ ;
ident : MU_TOK_IDENT
- {
+ {
$$.name = $1;
$$.locus = mu_cfg_locus;
}
;
tag : /* empty */
- {
+ {
$$ = NULL;
}
- | vallist
- ;
+ | vallist
+ ;
vallist : vlist
- {
+ {
size_t n = 0;
mu_list_count($1, &n);
if (n == 1)
@@ -266,7 +266,7 @@ vallist : vlist
{
size_t i;
mu_config_value_t val;
-
+
val.type = MU_CFG_ARRAY;
val.v.arg.c = n;
/* FIXME: Use mu_opool_alloc */
@@ -276,7 +276,7 @@ vallist : vlist
mu_cfg_perror (&mu_cfg_locus, _("not enough memory"));
abort();
}
-
+
for (i = 0; i < n; i++)
{
mu_config_value_t *v;
@@ -285,7 +285,7 @@ vallist : vlist
}
$$ = config_value_dup (&val);
}
- mu_list_destroy (&$1);
+ mu_list_destroy (&$1);
}
;
@@ -300,36 +300,36 @@ vlist : value
}
mu_list_append ($$, config_value_dup (&$1)); /* FIXME */
}
- | vlist value
- {
+ | vlist value
+ {
mu_list_append ($1, config_value_dup (&$2));
}
- ;
+ ;
value : string
- {
+ {
$$.type = MU_CFG_STRING;
$$.v.string = $1;
}
- | list
- {
+ | list
+ {
$$.type = MU_CFG_LIST;
$$.v.list = $1;
}
- | MU_TOK_MSTRING
- {
+ | MU_TOK_MSTRING
+ {
$$.type = MU_CFG_STRING;
$$.v.string = $1;
- }
- ;
+ }
+ ;
string : MU_TOK_STRING
- | MU_TOK_IDENT
- | slist
- ;
+ | MU_TOK_IDENT
+ | slist
+ ;
slist : slist0
- {
+ {
mu_iterator_t itr;
mu_list_get_iterator ($1, &itr);
@@ -347,48 +347,48 @@ slist : slist0
}
;
-slist0 : MU_TOK_QSTRING
- {
+slist0 : MU_TOK_QSTRING
+ {
mu_list_create (&$$);
mu_list_append ($$, $1);
}
- | slist0 MU_TOK_QSTRING
- {
+ | slist0 MU_TOK_QSTRING
+ {
mu_list_append ($1, $2);
$$ = $1;
}
- ;
+ ;
list : '(' values ')'
- {
+ {
$$ = $2;
}
- | '(' values ',' ')'
- {
+ | '(' values ',' ')'
+ {
$$ = $2;
}
- ;
+ ;
values : value
- {
+ {
mu_list_create (&$$);
mu_list_append ($$, config_value_dup (&$1));
}
- | values ',' value
- {
+ | values ',' value
+ {
mu_list_append ($1, config_value_dup (&$3));
$$ = $1;
}
- ;
+ ;
opt_sc : /* empty */
- | ';'
- ;
-
+ | ';'
+ ;
+
%%
-static int
+static int
_cfg_default_printer (void *unused, mu_log_level_t level, const char *str)
{
fprintf (stderr, "%s", str);
@@ -421,7 +421,7 @@ mu_cfg_parse (mu_cfg_tree_t **ptree)
mu_cfg_tree_t *tree;
mu_cfg_set_debug ();
-
+
_mu_cfg_errcnt = 0;
rc = yyparse ();
if (rc == 0 && _mu_cfg_errcnt)
@@ -436,7 +436,7 @@ mu_cfg_parse (mu_cfg_tree_t **ptree)
*ptree = tree;
return rc;
}
-
+
static int
_mu_cfg_preorder_recursive (mu_cfg_node_t *node,
mu_cfg_iter_func_t beg, mu_cfg_iter_func_t end,
@@ -456,10 +456,10 @@ _mu_cfg_preorder_recursive (mu_cfg_node_t *node,
if (end && end (node, data) == MU_CFG_ITER_STOP)
return MU_CFG_ITER_STOP;
break;
-
+
case MU_CFG_ITER_SKIP:
break;
-
+
case MU_CFG_ITER_STOP:
return MU_CFG_ITER_STOP;
}
@@ -500,15 +500,15 @@ _mu_cfg_postorder_recursive(mu_cfg_node_t *node,
if (end && end (node, data) == MU_CFG_ITER_STOP)
return MU_CFG_ITER_STOP;
break;
-
+
case MU_CFG_ITER_SKIP:
break;
-
+
case MU_CFG_ITER_STOP:
return MU_CFG_ITER_STOP;
}
break;
-
+
case mu_cfg_node_param:
return beg (node, data);
}
@@ -525,7 +525,7 @@ mu_cfg_postorder (mu_cfg_node_t *node,
&& mu_cfg_postorder (node->next, beg, end, data) == MU_CFG_ITER_STOP)
return 1;
return _mu_cfg_postorder_recursive (node, beg, end, data)
- == MU_CFG_ITER_STOP;
+ == MU_CFG_ITER_STOP;
}
@@ -580,7 +580,7 @@ find_container (mu_list_t list, enum mu_cfg_cont_type type,
{
mu_iterator_t iter;
struct mu_cfg_cont *ret = NULL;
-
+
if (len == 0)
len = strlen (ident);
@@ -665,8 +665,8 @@ pop_section (struct scan_tree_data *dat)
#define STRTONUM(s, type, base, res, limit, d, loc) \
{ \
type sum = 0; \
- \
- while (*s) \
+ \
+ for (; *s; s++) \
{
\
type x; \
\
@@ -690,7 +690,6 @@ pop_section (struct scan_tree_data *dat)
return 1; \
} \
sum = x; \
- *s++; \
}
\
res = sum; \
}
@@ -736,7 +735,7 @@ pop_section (struct scan_tree_data *dat)
const char *s = str; \
int sign; \
unsigned type limit; \
- \
+ \
if (*s == '-') \
{
\
sign++; \
@@ -749,7 +748,7 @@ pop_section (struct scan_tree_data *dat)
sign = 0; \
limit = TYPE_MAXIMUM (type); \
}
\
- \
+ \
STRxTONUM (s, unsigned type, tmpres, limit, d, loc); \
if (*s) \
{
\
@@ -774,7 +773,7 @@ parse_ipv4 (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
addr.s_addr = ntohl (addr.s_addr);
*res = addr;
return 0;
-}
+}
static int
parse_host (struct scan_tree_data *sdata, const mu_cfg_locus_t *locus,
@@ -792,11 +791,11 @@ parse_host (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
_("cannot resolve hostname `%s'"),
str);
return 1;
- }
+ }
addr.s_addr = ntohl (addr.s_addr);
*res = addr;
return 0;
-}
+}
static int
parse_cidr (struct scan_tree_data *sdata, const mu_cfg_locus_t *locus,
@@ -806,7 +805,7 @@ parse_cidr (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
unsigned long mask;
char astr[16];
const char *p, *s;
-
+
p = strchr (str, '/');
if (p)
{
@@ -867,7 +866,7 @@ parse_cidr (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
break;
addr.s_addr = (addr.s_addr << 8) + x;
}
-
+
if (*p)
{
_mu_cfg_perror (sdata->tree->debug, locus,
@@ -877,14 +876,14 @@ parse_cidr (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
}
mask = i * 8;
-
+
addr.s_addr <<= (4 - i) * 8;
}
-
+
res->addr = addr;
res->mask = mask;
return 0;
-}
+}
int
mu_cfg_parse_boolean (const char *str, int *res)
@@ -938,40 +937,40 @@ valcvt (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
*(char**)tgt = s;
break;
}
-
+
case mu_cfg_short:
GETSNUM (val->v.string, short, *(short*)tgt, sdata->tree->debug, locus);
break;
-
+
case mu_cfg_ushort:
GETUNUM (val->v.string, unsigned short, *(unsigned short*)tgt,
sdata->tree->debug, locus);
break;
-
+
case mu_cfg_int:
GETSNUM (val->v.string, int, *(int*)tgt, sdata->tree->debug, locus);
break;
-
+
case mu_cfg_uint:
GETUNUM (val->v.string, unsigned int, *(unsigned int*)tgt,
sdata->tree->debug, locus);
break;
-
+
case mu_cfg_long:
GETSNUM (val->v.string, long, *(long*)tgt,
sdata->tree->debug, locus);
break;
-
+
case mu_cfg_ulong:
GETUNUM (val->v.string, unsigned long, *(unsigned long*)tgt,
sdata->tree->debug, locus);
break;
-
+
case mu_cfg_size:
GETUNUM (val->v.string, size_t, *(size_t*)tgt,
sdata->tree->debug, locus);
break;
-
+
case mu_cfg_off:
_mu_cfg_perror (sdata->tree->debug, locus,
_("not implemented yet"));
@@ -982,22 +981,22 @@ valcvt (struct scan_tree_data *sdata, const
mu_cfg_locus_t *locus,
GETUNUM (val->v.string, time_t, *(time_t*)tgt,
sdata->tree->debug, locus);
break;
-
+
case mu_cfg_bool:
if (parse_bool (sdata, locus, val->v.string, (int*) tgt))
return 1;
break;
-
- case mu_cfg_ipv4:
+
+ case mu_cfg_ipv4:
if (parse_ipv4 (sdata, locus, val->v.string, (struct in_addr *)tgt))
return 1;
break;
-
+
case mu_cfg_cidr:
if (parse_cidr (sdata, locus, val->v.string, (mu_cfg_cidr_t *)tgt))
return 1;
break;
-
+
case mu_cfg_host:
if (parse_host (sdata, locus, val->v.string, (struct in_addr *)tgt))
return 1;
@@ -1060,12 +1059,12 @@ _set_fun (void *item, void *data)
_("not enough memory"));
return 1;
}
-
+
if (valcvt (clos->sdata, clos->locus, &tgt, clos->type, val) == 0)
mu_list_append (clos->list, tgt);
return 0;
}
-
+
static int
parse_param (struct scan_tree_data *sdata, const mu_cfg_node_t *node)
{
@@ -1073,7 +1072,7 @@ parse_param (struct scan_tree_data *sdata, const
mu_cfg_node_t *node)
struct set_closure clos;
struct mu_cfg_param *param = find_param (sdata->list->sec, node->tag,
0);
-
+
if (!param)
{
_mu_cfg_perror (sdata->tree->debug, &node->locus,
@@ -1108,7 +1107,7 @@ parse_param (struct scan_tree_data *sdata, const
mu_cfg_node_t *node)
{
case MU_CFG_LIST:
break;
-
+
case MU_CFG_STRING:
{
mu_list_t list;
@@ -1142,7 +1141,7 @@ parse_param (struct scan_tree_data *sdata, const
mu_cfg_node_t *node)
}
if (param->callback (sdata->tree->debug, tgt, node->label))
return 1;
-
+
}
else
return valcvt (sdata, &node->locus, tgt, clos.type, node->label);
@@ -1156,12 +1155,12 @@ _scan_tree_helper (const mu_cfg_node_t *node, void
*data)
{
struct scan_tree_data *sdata = data;
struct mu_cfg_section *sec;
-
+
switch (node->type)
{
case mu_cfg_node_undefined:
abort ();
-
+
case mu_cfg_node_tag:
sec = find_subsection (sdata->list->sec, node->tag, 0);
if (!sec)
@@ -1185,7 +1184,7 @@ _scan_tree_helper (const mu_cfg_node_t *node, void *data)
{
mu_debug_set_locus (sdata->tree->debug,
node->locus.file ?
- node->locus.file : _("unknown file"),
+ node->locus.file : _("unknown file"),
node->locus.line);
if (sec->parser (mu_cfg_section_start, node,
sec->label, &sec->target,
@@ -1197,7 +1196,7 @@ _scan_tree_helper (const mu_cfg_node_t *node, void *data)
}
push_section(sdata, sec);
break;
-
+
case mu_cfg_node_param:
if (parse_param (sdata, node))
{
@@ -1214,12 +1213,12 @@ _scan_tree_end_helper (const mu_cfg_node_t *node, void
*data)
{
struct scan_tree_data *sdata = data;
struct mu_cfg_section *sec;
-
+
switch (node->type)
{
default:
abort ();
-
+
case mu_cfg_node_tag:
sec = pop_section (sdata);
if (sec && sec->parser)
@@ -1273,19 +1272,19 @@ mu_cfg_find_section (struct mu_cfg_section *root_sec,
struct mu_cfg_section *sec;
size_t len;
const char *p;
-
+
while (*path == '/')
path++;
if (*path == 0)
return MU_ERR_NOENT;
-
+
p = strchr (path, '/');
if (p)
len = p - path;
else
len = strlen (path);
-
+
sec = find_subsection (root_sec, path, len);
if (!sec)
return MU_ERR_NOENT;
@@ -1326,7 +1325,7 @@ mu_cfg_tree_create_node (struct mu_cfg_tree *tree,
mu_cfg_node_t *np;
size_t size = sizeof *np + strlen (tag) + 1;
mu_config_value_t val;
-
+
np = mu_alloc (size);
np->type = type;
if (loc)
diff --git a/mailbox/secret.c b/mailbox/secret.c
index d34bc02..482949e 100644
--- a/mailbox/secret.c
+++ b/mailbox/secret.c
@@ -55,7 +55,7 @@ mu_secret_create (mu_secret_t *psec, const char *value,
size_t len)
return ENOMEM;
sec->obptr = (unsigned char*)(sec + 1);
sec->clptr = sec->obptr + len + 1;
- obfuscate (value, sec->obptr, len);
+ obfuscate ((unsigned char *) value, sec->obptr, len);
sec->length = len;
*psec = sec;
mu_secret_ref (sec);
diff --git a/pop3d/pop3d.c b/pop3d/pop3d.c
index 6df4ea6..6c725cb 100644
--- a/pop3d/pop3d.c
+++ b/pop3d/pop3d.c
@@ -268,7 +268,7 @@ pop3d_get_client_address (int fd, struct sockaddr_in *pcs)
}
else
{
- int len = sizeof *pcs;
+ socklen_t len = sizeof *pcs;
if (getpeername (fd, (struct sockaddr*) pcs, &len) < 0)
{
mu_diag_output (MU_DIAG_ERROR,
diff --git a/python/libmu_py/address.c b/python/libmu_py/address.c
index 1633d23..ebba61f 100644
--- a/python/libmu_py/address.c
+++ b/python/libmu_py/address.c
@@ -269,7 +269,8 @@ api_address_get_route (PyObject *self, PyObject *args)
static PyObject *
api_address_to_string (PyObject *self, PyObject *args)
{
- int status, n;
+ int status;
+ size_t n;
char buf[256];
PyAddress *py_addr;
diff --git a/sql/odbc.c b/sql/odbc.c
index e483806..2f2e5b1 100644
--- a/sql/odbc.c
+++ b/sql/odbc.c
@@ -160,7 +160,7 @@ odbc_query (mu_sql_connection_t conn, char *query)
return MU_ERR_SQL;
}
- rc = SQLExecDirect (dp->stmt, query, SQL_NTS);
+ rc = SQLExecDirect (dp->stmt, (SQLCHAR*) query, SQL_NTS);
if (rc != SQL_SUCCESS)
{
mu_odbc_diag (dp, SQL_HANDLE_STMT, dp->stmt, "SQLExecDirect");
@@ -305,7 +305,7 @@ odbc_get_field_number (mu_sql_connection_t conn, const char
*fname,
dp->fnames[i] = name;
ret = SQLDescribeCol (dp->stmt,
i + 1,
- name,
+ (SQLCHAR*) name,
namelen + 1,
&namelen,
NULL,
@@ -340,7 +340,7 @@ static const char *
odbc_errstr (mu_sql_connection_t conn)
{
struct mu_odbc_data *dp = conn->data;
- char state[16];
+ SQLCHAR state[16];
char nbuf[64];
SQLINTEGER nerror;
SQLSMALLINT msglen;
@@ -365,14 +365,14 @@ odbc_errstr (mu_sql_connection_t conn)
snprintf (nbuf, sizeof nbuf, "%d", (int) nerror);
length = strlen (dp->err.what) + 1
- + strlen (state) + 1
+ + strlen ((char*) state) + 1
+ strlen (nbuf) + 1
- + strlen (dp->err.msg) + 1;
+ + strlen ((char*) dp->err.msg) + 1;
if (dp->err.text)
free (dp->err.text);
dp->err.text = malloc (length);
if (!dp->err.text)
- return dp->err.msg;
+ return (char*) dp->err.msg;
snprintf (dp->err.text, length, "%s %s %s %s", dp->err.what, state, nbuf,
dp->err.msg);
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. rel-2_1-9-g4f36463,
Sergey Poznyakoff <=