[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-717-g4c698e8
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-717-g4c698e8 |
|
Date: |
Sun, 28 Jun 2015 06:57:03 +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=4c698e8d63d1348803c076f992b9fe82f978cb34
The branch, master has been updated
via 4c698e8d63d1348803c076f992b9fe82f978cb34 (commit)
from a9d4381b5da8db6d9fb05d6089baaf4b775b424d (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 4c698e8d63d1348803c076f992b9fe82f978cb34
Author: Sergey Poznyakoff <address@hidden>
Date: Sun Jun 28 09:43:53 2015 +0300
Fix compilation warnings
* configure.ac: Check for intptr_t
* comsat/action.c (need_crlf): Use intermediate cast to intptr_t.
* imap4d/imap4d.c (cb2_group, mu_get_user_groups): Likewise.
* libmailutils/stream/file_stream.c (fd_ioctl): Likewise.
* libmailutils/stream/mapfile_stream.c (_mapfile_ioctl): Likewise.
* libmailutils/stream/tcp.c (_tcp_ioctl): Likewise.
* maidag/maidag.c (cb2_group): Likewise.
* frm/common.c (puts_bidi): Fix the type of 3rd parameter to
fribidi_log2vis
* include/mailutils/body.h: Use MU_DEPRECATED instead of\
__attribute__ ((deprecated)).
* include/mailutils/cfg.h: Likewise.
* include/mailutils/header.h: Likewise.
* include/mailutils/libargp.h: Likewise.
* include/mailutils/mailbox.h: Likewise.
* include/mailutils/mailer.h: Likewise.
* include/mailutils/registrar.h: Likewise.
* include/mailutils/message.h: Likewise.
(mu_message_set_stream): Remove deprecation marker.
-----------------------------------------------------------------------
Summary of changes:
comsat/action.c | 2 +-
configure.ac | 1 +
frm/common.c | 9 ++++-----
imap4d/imap4d.c | 10 ++++++----
include/mailutils/body.h | 3 +--
include/mailutils/cfg.h | 3 ++-
include/mailutils/header.h | 3 +--
include/mailutils/libargp.h | 2 +-
include/mailutils/mailbox.h | 3 +--
include/mailutils/mailer.h | 3 +--
include/mailutils/message.h | 6 ++----
include/mailutils/registrar.h | 2 +-
libmailutils/stream/file_stream.c | 4 ++--
libmailutils/stream/mapfile_stream.c | 2 +-
libmailutils/stream/tcp.c | 2 +-
maidag/maidag.c | 2 +-
16 files changed, 27 insertions(+), 30 deletions(-)
diff --git a/comsat/action.c b/comsat/action.c
index 2385b63..3aa1bfb 100644
--- a/comsat/action.c
+++ b/comsat/action.c
@@ -186,7 +186,7 @@ need_crlf (mu_stream_t str)
if (mu_stream_ioctl (str, MU_IOCTL_TRANSPORT, MU_IOCTL_OP_GET, trans))
return 1; /* suppose we do need it */
- if (tcgetattr ((int)trans[0], &tbuf) == 0 &&
+ if (tcgetattr ((int) (intptr_t) trans[0], &tbuf) == 0 &&
(tbuf.c_oflag & OPOST) && (tbuf.c_oflag & ONLCR))
return 0;
else
diff --git a/configure.ac b/configure.ac
index 5278d18..ac70652 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,6 +640,7 @@ AC_TYPE_MODE_T
AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
+AC_TYPE_INTPTR_T
AC_CHECK_TYPE(ssize_t, , AC_DEFINE(ssize_t, int, [Define to int if
<sys/types.h> does not define]))
AC_TYPE_SIGNAL
AC_DECL_SYS_SIGLIST
diff --git a/frm/common.c b/frm/common.c
index b624efa..e4adefe 100644
--- a/frm/common.c
+++ b/frm/common.c
@@ -131,7 +131,7 @@ puts_bidi (char *string)
else
{
FriBidiStrIndex len;
- FriBidiCharType base = FRIBIDI_TYPE_ON;
+ FriBidiParType base = FRIBIDI_TYPE_ON;
fribidi_boolean log2vis;
static FriBidiChar *visual;
@@ -156,7 +156,6 @@ puts_bidi (char *string)
if (log2vis)
{
FriBidiStrIndex idx, st;
- FriBidiStrIndex new_len;
for (idx = 0; idx < len;)
{
@@ -183,9 +182,9 @@ puts_bidi (char *string)
idx--;
inlen = idx - st;
- new_len = fribidi_unicode_to_charset (fb_charset_num,
- visual + st, inlen,
- outstring);
+ fribidi_unicode_to_charset (fb_charset_num,
+ visual + st, inlen,
+ outstring);
mu_printf ("%s", outstring);
}
mu_printf ("\n");
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 63a759f..2f3020b 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -260,7 +260,7 @@ cb2_group (const char *gname, void *data)
if (!group)
mu_error (_("unknown group: %s"), gname);
else
- mu_list_append (list, (void*)group->gr_gid);
+ mu_list_append (list, (void*) (intptr_t) group->gr_gid);
return 0;
}
@@ -480,11 +480,13 @@ mu_get_user_groups (const char *user, mu_list_t retain,
mu_list_t *pgrouplist)
for (p = gr->gr_mem; *p; p++)
if (strcmp (*p, user) == 0)
{
- if (retain && mu_list_locate (retain, (void*)gr->gr_gid, NULL))
+ if (retain
+ && mu_list_locate (retain, (void*) (intptr_t) gr->gr_gid,
+ NULL))
continue;
/* FIXME: Avoid duplicating gids */
- rc = mu_list_append (list, (void*)gr->gr_gid);
+ rc = mu_list_append (list, (void*) (intptr_t) gr->gr_gid);
if (rc)
mu_error(_("%s: cannot append to list: %s"),
"mu_get_user_groups",
@@ -592,7 +594,7 @@ imap4d_session_setup0 ()
free (real_homedir);
return 1;
}
- mu_list_append (groups, (void*)auth_data->gid);
+ mu_list_append (groups, (void*) (intptr_t) auth_data->gid);
rc = mu_get_user_groups (auth_data->name, user_retain_groups,
&groups);
diff --git a/include/mailutils/body.h b/include/mailutils/body.h
index dd89f25..5d5542f 100644
--- a/include/mailutils/body.h
+++ b/include/mailutils/body.h
@@ -31,8 +31,7 @@ extern void * mu_body_get_owner (mu_body_t);
extern int mu_body_is_modified (mu_body_t);
extern int mu_body_clear_modified (mu_body_t);
-extern int mu_body_get_stream (mu_body_t, mu_stream_t *)
- __attribute__ ((deprecated));
+extern int mu_body_get_stream (mu_body_t, mu_stream_t *) MU_DEPRECATED;
extern int mu_body_get_streamref (mu_body_t body, mu_stream_t *pstream);
extern int mu_body_set_stream (mu_body_t, mu_stream_t, void *owner);
extern int mu_body_set_get_stream (mu_body_t,
diff --git a/include/mailutils/cfg.h b/include/mailutils/cfg.h
index 6b37846..0780959 100644
--- a/include/mailutils/cfg.h
+++ b/include/mailutils/cfg.h
@@ -18,6 +18,7 @@
#ifndef _MAILUTILS_CFG_H
#define _MAILUTILS_CFG_H
+#include <mailutils/types.h>
#include <mailutils/list.h>
#include <mailutils/debug.h>
#include <mailutils/opool.h>
@@ -263,7 +264,7 @@ int mu_config_register_plain_section (const char
*parent_path,
#ifdef MU_CFG_COMPATIBILITY
# define MU_CFG_DEPRECATED
#else
-# define MU_CFG_DEPRECATED __attribute__ ((deprecated))
+# define MU_CFG_DEPRECATED MU_DEPRECATED
#endif
int mu_parse_config (const char *file, const char *progname,
diff --git a/include/mailutils/header.h b/include/mailutils/header.h
index eb4a43b..368a127 100644
--- a/include/mailutils/header.h
+++ b/include/mailutils/header.h
@@ -152,8 +152,7 @@ extern int mu_header_get_field_value_unfold (mu_header_t
header, size_t num,
extern int mu_header_aget_field_value_unfold (mu_header_t header, size_t num,
char **pvalue);
-extern int mu_header_get_stream (mu_header_t, mu_stream_t *)
- __attribute__ ((deprecated));
+extern int mu_header_get_stream (mu_header_t, mu_stream_t *) MU_DEPRECATED;
extern int mu_header_get_streamref (mu_header_t, mu_stream_t *);
/* FIXME: This function does not exist:
diff --git a/include/mailutils/libargp.h b/include/mailutils/libargp.h
index 33b1ac1..f556e4f 100644
--- a/include/mailutils/libargp.h
+++ b/include/mailutils/libargp.h
@@ -78,7 +78,7 @@ error_t mu_argp_parse (const struct argp *myargp,
unsigned flags,
const char *capa[],
int *arg_index,
- void *input) __attribute__ ((deprecated));
+ void *input) MU_DEPRECATED;
void mu_argp_node_list_init (mu_list_t *);
void mu_argp_node_list_add (mu_list_t, mu_cfg_node_t *);
diff --git a/include/mailutils/mailbox.h b/include/mailutils/mailbox.h
index 51332a8..139d395 100644
--- a/include/mailutils/mailbox.h
+++ b/include/mailutils/mailbox.h
@@ -69,8 +69,7 @@ extern int mu_mailbox_messages_recent (mu_mailbox_t, size_t
*);
extern int mu_mailbox_message_unseen (mu_mailbox_t, size_t *);
extern int mu_mailbox_expunge (mu_mailbox_t);
extern int mu_mailbox_sync (mu_mailbox_t);
-extern int mu_mailbox_save_attributes (mu_mailbox_t)
- __attribute__ ((deprecated));
+extern int mu_mailbox_save_attributes (mu_mailbox_t) MU_DEPRECATED;
#define MU_UIDL_LENGTH 70
#define MU_UIDL_BUFFER_SIZE (MU_UIDL_LENGTH+1)
diff --git a/include/mailutils/mailer.h b/include/mailutils/mailer.h
index d2d8623..b979b66 100644
--- a/include/mailutils/mailer.h
+++ b/include/mailutils/mailer.h
@@ -52,8 +52,7 @@ extern int mu_mailer_get_url_default (const char** url);
extern int mu_mailer_get_property (mu_mailer_t, mu_property_t *);
int mu_mailer_set_property (mu_mailer_t, mu_property_t);
-extern int mu_mailer_get_stream (mu_mailer_t, mu_stream_t *)
- __attribute__ ((deprecated));
+extern int mu_mailer_get_stream (mu_mailer_t, mu_stream_t *) MU_DEPRECATED;
extern int mu_mailer_get_streamref (mu_mailer_t, mu_stream_t *);
extern int mu_mailer_set_stream (mu_mailer_t, mu_stream_t);
extern int mu_mailer_get_observable (mu_mailer_t, mu_observable_t *);
diff --git a/include/mailutils/message.h b/include/mailutils/message.h
index 131f171..e253662 100644
--- a/include/mailutils/message.h
+++ b/include/mailutils/message.h
@@ -134,12 +134,10 @@ extern int mu_message_set_header (mu_message_t,
mu_header_t, void *);
extern int mu_message_get_body (mu_message_t, mu_body_t *);
extern int mu_message_set_body (mu_message_t, mu_body_t, void *);
-extern int mu_message_get_stream (mu_message_t, mu_stream_t *)
- __attribute__((deprecated));
+extern int mu_message_get_stream (mu_message_t, mu_stream_t *) MU_DEPRECATED;
extern int mu_message_get_streamref (mu_message_t, mu_stream_t *);
-extern int mu_message_set_stream (mu_message_t, mu_stream_t, void *)
- __attribute__((deprecated));
+extern int mu_message_set_stream (mu_message_t, mu_stream_t, void *);
extern int mu_message_get_attribute (mu_message_t, mu_attribute_t *);
extern int mu_message_set_attribute (mu_message_t, mu_attribute_t, void *);
diff --git a/include/mailutils/registrar.h b/include/mailutils/registrar.h
index 61b9454..3f15159 100644
--- a/include/mailutils/registrar.h
+++ b/include/mailutils/registrar.h
@@ -64,7 +64,7 @@ void mu_registrar_set_default_record (mu_record_t record);
/* Registration. */
int mu_registrar_get_iterator (mu_iterator_t *);
-int mu_registrar_get_list (mu_list_t *) __attribute__ ((deprecated));
+int mu_registrar_get_list (mu_list_t *) MU_DEPRECATED;
int mu_registrar_lookup_scheme (const char *scheme,
mu_record_t *precord);
diff --git a/libmailutils/stream/file_stream.c
b/libmailutils/stream/file_stream.c
index 4e3f7e8..8e6e0cd 100644
--- a/libmailutils/stream/file_stream.c
+++ b/libmailutils/stream/file_stream.c
@@ -181,13 +181,13 @@ fd_ioctl (struct _mu_stream *str, int code, int opcode,
void *ptr)
{
case MU_IOCTL_OP_GET:
ptrans = ptr;
- ptrans[0] = (mu_transport_t) fstr->fd;
+ ptrans[0] = (mu_transport_t) (intptr_t) fstr->fd;
ptrans[1] = NULL;
break;
case MU_IOCTL_OP_SET:
ptrans = ptr;
- fstr->fd = (int) ptrans[0];
+ fstr->fd = (int) (intptr_t) ptrans[0];
break;
}
break;
diff --git a/libmailutils/stream/mapfile_stream.c
b/libmailutils/stream/mapfile_stream.c
index 53e86c4..dcf785c 100644
--- a/libmailutils/stream/mapfile_stream.c
+++ b/libmailutils/stream/mapfile_stream.c
@@ -222,7 +222,7 @@ _mapfile_ioctl (struct _mu_stream *str, int code, int
opcode, void *ptr)
switch (opcode)
{
case MU_IOCTL_OP_GET:
- ptrans[0] = (mu_transport_t) mfs->fd;
+ ptrans[0] = (mu_transport_t) (intptr_t) mfs->fd;
ptrans[1] = NULL;
break;
case MU_IOCTL_OP_SET:
diff --git a/libmailutils/stream/tcp.c b/libmailutils/stream/tcp.c
index 8935ae7..bf6e94b 100644
--- a/libmailutils/stream/tcp.c
+++ b/libmailutils/stream/tcp.c
@@ -167,7 +167,7 @@ _tcp_ioctl (mu_stream_t stream, int code, int opcode, void
*ptr)
switch (opcode)
{
case MU_IOCTL_OP_GET:
- ptrans[0] = (mu_transport_t) tcp->fd;
+ ptrans[0] = (mu_transport_t) (intptr_t) tcp->fd;
ptrans[1] = NULL;
break;
case MU_IOCTL_OP_SET:
diff --git a/maidag/maidag.c b/maidag/maidag.c
index da90498..8964cc7 100644
--- a/maidag/maidag.c
+++ b/maidag/maidag.c
@@ -300,7 +300,7 @@ cb2_group (const char *gname, void *data)
if (!group)
mu_error (_("unknown group: %s"), gname);
else
- mu_list_append (list, (void*)group->gr_gid);
+ mu_list_append (list, (void*) (intptr_t) group->gr_gid);
return 0;
}
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-717-g4c698e8,
Sergey Poznyakoff <=