dovecot-2.2: Compiler warning fixes
dovecot at dovecot.org
dovecot at dovecot.org
Sun May 20 03:26:35 EEST 2012
details: http://hg.dovecot.org/dovecot-2.2/rev/cb80c575b00c
changeset: 14553:cb80c575b00c
user: Timo Sirainen <tss at iki.fi>
date: Tue May 08 08:31:27 2012 +0300
description:
Compiler warning fixes
diffstat:
src/auth/db-checkpassword.c | 14 +++---
src/auth/db-checkpassword.h | 4 +-
src/auth/passdb-checkpassword.c | 8 +-
src/auth/userdb-checkpassword.c | 4 +-
src/lib-storage/mail-search-register-human.c | 18 ++++----
src/lib-storage/mail-search-register-imap.c | 60 ++++++++++++++--------------
src/lib/test-array.c | 2 +-
src/lib/test-base64.c | 8 +-
8 files changed, 59 insertions(+), 59 deletions(-)
diffs (truncated from 302 to 300 lines):
diff -r 17a635cbb63d -r cb80c575b00c src/auth/db-checkpassword.c
--- a/src/auth/db-checkpassword.c Tue May 08 01:24:01 2012 +0300
+++ b/src/auth/db-checkpassword.c Tue May 08 08:31:27 2012 +0300
@@ -29,7 +29,7 @@
char *auth_password;
db_checkpassword_callback_t *callback;
- void *context;
+ void (*request_callback)();
pid_t pid;
int fd_out, fd_in;
@@ -115,7 +115,7 @@
extra_fields = t_strsplit_tabescaped(str_c(request->input_buf));
request->callback(request->request, status, extra_fields,
- request->context);
+ request->request_callback);
checkpassword_request_free(&request);
}
@@ -448,7 +448,7 @@
struct auth_request *request,
const char *auth_password,
db_checkpassword_callback_t *callback,
- void *context)
+ void (*request_callback)())
{
struct chkpw_auth_request *chkpw_auth_request;
unsigned int output_len;
@@ -464,7 +464,7 @@
"Username+password combination too long (%u bytes)",
output_len);
callback(request, DB_CHECKPASSWORD_STATUS_FAILURE,
- NULL, context);
+ NULL, request_callback);
return;
}
@@ -477,7 +477,7 @@
(void)close(fd_in[1]);
}
callback(request, DB_CHECKPASSWORD_STATUS_INTERNAL_FAILURE,
- NULL, context);
+ NULL, request_callback);
return;
}
@@ -490,7 +490,7 @@
(void)close(fd_out[0]);
(void)close(fd_out[1]);
callback(request, DB_CHECKPASSWORD_STATUS_INTERNAL_FAILURE,
- NULL, context);
+ NULL, request_callback);
return;
}
@@ -523,7 +523,7 @@
chkpw_auth_request->output_len = output_len;
chkpw_auth_request->input_buf = str_new(default_pool, 256);
chkpw_auth_request->callback = callback;
- chkpw_auth_request->context = context;
+ chkpw_auth_request->request_callback = request_callback;
chkpw_auth_request->io_in =
io_add(fd_in[0], IO_READ, checkpassword_child_input,
diff -r 17a635cbb63d -r cb80c575b00c src/auth/db-checkpassword.h
--- a/src/auth/db-checkpassword.h Tue May 08 01:24:01 2012 +0300
+++ b/src/auth/db-checkpassword.h Tue May 08 08:31:27 2012 +0300
@@ -13,7 +13,7 @@
typedef void db_checkpassword_callback_t(struct auth_request *request,
enum db_checkpassword_status status,
const char *const *extra_fields,
- void *context);
+ void (*request_callback)());
struct db_checkpassword *
db_checkpassword_init(const char *checkpassword_path,
@@ -24,6 +24,6 @@
struct auth_request *request,
const char *auth_password,
db_checkpassword_callback_t *callback,
- void *context);
+ void (*request_callback)());
#endif
diff -r 17a635cbb63d -r cb80c575b00c src/auth/passdb-checkpassword.c
--- a/src/auth/passdb-checkpassword.c Tue May 08 01:24:01 2012 +0300
+++ b/src/auth/passdb-checkpassword.c Tue May 08 08:31:27 2012 +0300
@@ -17,9 +17,9 @@
auth_checkpassword_callback(struct auth_request *request,
enum db_checkpassword_status status,
const char *const *extra_fields,
- void *context)
+ void (*request_callback)())
{
- verify_plain_callback_t *callback = context;
+ verify_plain_callback_t *callback = request_callback;
const char *scheme, *crypted_pass = NULL;
unsigned int i;
@@ -71,9 +71,9 @@
credentials_checkpassword_callback(struct auth_request *request,
enum db_checkpassword_status status,
const char *const *extra_fields,
- void *context)
+ void (*request_callback)())
{
- lookup_credentials_callback_t *callback = context;
+ lookup_credentials_callback_t *callback = request_callback;
const char *scheme, *crypted_pass = NULL;
unsigned int i;
diff -r 17a635cbb63d -r cb80c575b00c src/auth/userdb-checkpassword.c
--- a/src/auth/userdb-checkpassword.c Tue May 08 01:24:01 2012 +0300
+++ b/src/auth/userdb-checkpassword.c Tue May 08 08:31:27 2012 +0300
@@ -16,9 +16,9 @@
userdb_checkpassword_callback(struct auth_request *request,
enum db_checkpassword_status status,
const char *const *extra_fields,
- void *context)
+ void (*request_callback)())
{
- userdb_callback_t *callback = context;
+ userdb_callback_t *callback = request_callback;
unsigned int i;
switch (status) {
diff -r 17a635cbb63d -r cb80c575b00c src/lib-storage/mail-search-register-human.c
--- a/src/lib-storage/mail-search-register-human.c Tue May 08 01:24:01 2012 +0300
+++ b/src/lib-storage/mail-search-register-human.c Tue May 08 08:31:27 2012 +0300
@@ -83,17 +83,17 @@
{ \
return arg_new_human_date(ctx, _type, _date_type); \
}
-CALLBACK_DATE(before, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_RECEIVED);
-CALLBACK_DATE(on, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_RECEIVED);
-CALLBACK_DATE(since, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_RECEIVED);
+CALLBACK_DATE(before, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_RECEIVED)
+CALLBACK_DATE(on, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_RECEIVED)
+CALLBACK_DATE(since, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_RECEIVED)
-CALLBACK_DATE(sentbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SENT);
-CALLBACK_DATE(senton, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SENT);
-CALLBACK_DATE(sentsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SENT);
+CALLBACK_DATE(sentbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SENT)
+CALLBACK_DATE(senton, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SENT)
+CALLBACK_DATE(sentsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SENT)
-CALLBACK_DATE(savedbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SAVED);
-CALLBACK_DATE(savedon, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SAVED);
-CALLBACK_DATE(savedsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SAVED);
+CALLBACK_DATE(savedbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SAVED)
+CALLBACK_DATE(savedon, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SAVED)
+CALLBACK_DATE(savedsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SAVED)
static struct mail_search_arg *
arg_new_human_size(struct mail_search_build_context *ctx,
diff -r 17a635cbb63d -r cb80c575b00c src/lib-storage/mail-search-register-imap.c
--- a/src/lib-storage/mail-search-register-imap.c Tue May 08 01:24:01 2012 +0300
+++ b/src/lib-storage/mail-search-register-imap.c Tue May 08 08:31:27 2012 +0300
@@ -116,18 +116,18 @@
sarg->match_not = _not; \
return sarg; \
}
-CALLBACK_FLAG(answered, MAIL_ANSWERED, FALSE);
-CALLBACK_FLAG(unanswered, MAIL_ANSWERED, TRUE);
-CALLBACK_FLAG(deleted, MAIL_DELETED, FALSE);
-CALLBACK_FLAG(undeleted, MAIL_DELETED, TRUE);
-CALLBACK_FLAG(draft, MAIL_DRAFT, FALSE);
-CALLBACK_FLAG(undraft, MAIL_DRAFT, TRUE);
-CALLBACK_FLAG(flagged, MAIL_FLAGGED, FALSE);
-CALLBACK_FLAG(unflagged, MAIL_FLAGGED, TRUE);
-CALLBACK_FLAG(seen, MAIL_SEEN, FALSE);
-CALLBACK_FLAG(unseen, MAIL_SEEN, TRUE);
-CALLBACK_FLAG(recent, MAIL_RECENT, FALSE);
-CALLBACK_FLAG(old, MAIL_RECENT, TRUE);
+CALLBACK_FLAG(answered, MAIL_ANSWERED, FALSE)
+CALLBACK_FLAG(unanswered, MAIL_ANSWERED, TRUE)
+CALLBACK_FLAG(deleted, MAIL_DELETED, FALSE)
+CALLBACK_FLAG(undeleted, MAIL_DELETED, TRUE)
+CALLBACK_FLAG(draft, MAIL_DRAFT, FALSE)
+CALLBACK_FLAG(undraft, MAIL_DRAFT, TRUE)
+CALLBACK_FLAG(flagged, MAIL_FLAGGED, FALSE)
+CALLBACK_FLAG(unflagged, MAIL_FLAGGED, TRUE)
+CALLBACK_FLAG(seen, MAIL_SEEN, FALSE)
+CALLBACK_FLAG(unseen, MAIL_SEEN, TRUE)
+CALLBACK_FLAG(recent, MAIL_RECENT, FALSE)
+CALLBACK_FLAG(old, MAIL_RECENT, TRUE)
static struct mail_search_arg *
imap_search_new(struct mail_search_build_context *ctx)
@@ -141,7 +141,7 @@
return sarg;
}
-CALLBACK_STR(keyword, SEARCH_KEYWORDS);
+CALLBACK_STR(keyword, SEARCH_KEYWORDS)
static struct mail_search_arg *
imap_search_unkeyword(struct mail_search_build_context *ctx)
@@ -179,17 +179,17 @@
{ \
return arg_new_date(ctx, _type, _date_type); \
}
-CALLBACK_DATE(before, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_RECEIVED);
-CALLBACK_DATE(on, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_RECEIVED);
-CALLBACK_DATE(since, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_RECEIVED);
+CALLBACK_DATE(before, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_RECEIVED)
+CALLBACK_DATE(on, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_RECEIVED)
+CALLBACK_DATE(since, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_RECEIVED)
-CALLBACK_DATE(sentbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SENT);
-CALLBACK_DATE(senton, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SENT);
-CALLBACK_DATE(sentsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SENT);
+CALLBACK_DATE(sentbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SENT)
+CALLBACK_DATE(senton, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SENT)
+CALLBACK_DATE(sentsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SENT)
-CALLBACK_DATE(x_savedbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SAVED);
-CALLBACK_DATE(x_savedon, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SAVED);
-CALLBACK_DATE(x_savedsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SAVED);
+CALLBACK_DATE(x_savedbefore, SEARCH_BEFORE, MAIL_SEARCH_DATE_TYPE_SAVED)
+CALLBACK_DATE(x_savedon, SEARCH_ON, MAIL_SEARCH_DATE_TYPE_SAVED)
+CALLBACK_DATE(x_savedsince, SEARCH_SINCE, MAIL_SEARCH_DATE_TYPE_SAVED)
static struct mail_search_arg *
arg_new_size(struct mail_search_build_context *ctx,
@@ -245,11 +245,11 @@
{ \
return arg_new_header(ctx, _type, #_name); \
}
-CALLBACK_HDR(bcc, SEARCH_HEADER_ADDRESS);
-CALLBACK_HDR(cc, SEARCH_HEADER_ADDRESS);
-CALLBACK_HDR(from, SEARCH_HEADER_ADDRESS);
-CALLBACK_HDR(to, SEARCH_HEADER_ADDRESS);
-CALLBACK_HDR(subject, SEARCH_HEADER_COMPRESS_LWSP);
+CALLBACK_HDR(bcc, SEARCH_HEADER_ADDRESS)
+CALLBACK_HDR(cc, SEARCH_HEADER_ADDRESS)
+CALLBACK_HDR(from, SEARCH_HEADER_ADDRESS)
+CALLBACK_HDR(to, SEARCH_HEADER_ADDRESS)
+CALLBACK_HDR(subject, SEARCH_HEADER_COMPRESS_LWSP)
static struct mail_search_arg *
imap_search_header(struct mail_search_build_context *ctx)
@@ -291,8 +291,8 @@
{ \
return arg_new_body(ctx, _type); \
}
-CALLBACK_BODY(body, SEARCH_BODY);
-CALLBACK_BODY(text, SEARCH_TEXT);
+CALLBACK_BODY(body, SEARCH_BODY)
+CALLBACK_BODY(text, SEARCH_TEXT)
static struct mail_search_arg *
arg_new_interval(struct mail_search_build_context *ctx,
@@ -478,7 +478,7 @@
return sarg;
}
-CALLBACK_STR(x_guid, SEARCH_GUID);
+CALLBACK_STR(x_guid, SEARCH_GUID)
static struct mail_search_arg *
imap_search_x_mailbox(struct mail_search_build_context *ctx)
diff -r 17a635cbb63d -r cb80c575b00c src/lib/test-array.c
--- a/src/lib/test-array.c Tue May 08 01:24:01 2012 +0300
+++ b/src/lib/test-array.c Tue May 08 08:31:27 2012 +0300
@@ -33,7 +33,7 @@
static void test_array_reverse(void)
{
ARRAY_DEFINE(intarr, int);
- int input[] = { -1234567890, -272585721, 2724859223U, 824725652 };
+ int input[] = { -1234567890, -272585721, 272485922, 824725652 };
const int *output;
unsigned int i, j;
diff -r 17a635cbb63d -r cb80c575b00c src/lib/test-base64.c
--- a/src/lib/test-base64.c Tue May 08 01:24:01 2012 +0300
+++ b/src/lib/test-base64.c Tue May 08 08:31:27 2012 +0300
@@ -48,9 +48,9 @@
"aGVs!!!!!"
};
static const struct test_base64_decode_output output[] = {
- { "hello world", 0, -1 },
- { "foo barits", 0, -1 },
- { "just niin", 1, -1 },
+ { "hello world", 0, -1U },
+ { "foo barits", 0, -1U },
+ { "just niin", 1, -1U },
{ "hel", 1, 4 },
{ "hel", -1, 4 },
{ "hel", -1, 4 }
@@ -71,7 +71,7 @@
test_assert(output[i].ret == ret &&
strcmp(output[i].text, str_c(str)) == 0 &&
(src_pos == output[i].src_pos ||
- (output[i].src_pos == (unsigned int)-1 &&
+ (output[i].src_pos == -1U &&
src_pos == strlen(input[i]))));
More information about the dovecot-cvs
mailing list