From: Timo Sirainen Date: Wed, 27 Jun 2012 01:24:53 +0000 (+0300) Subject: Try to avoid (void) casts by adding more ATTR_NOWARN_UNUSED_RESULT. X-Git-Tag: 2.2.alpha1~453 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e8d6d03c2ff85448df79b181a2ea850fb5d4199;p=thirdparty%2Fdovecot%2Fcore.git Try to avoid (void) casts by adding more ATTR_NOWARN_UNUSED_RESULT. --- diff --git a/src/lib-imap/imap-bodystructure.c b/src/lib-imap/imap-bodystructure.c index 5021016b4a..589883e127 100644 --- a/src/lib-imap/imap-bodystructure.c +++ b/src/lib-imap/imap-bodystructure.c @@ -44,7 +44,7 @@ static void parse_content_type(struct message_part_body_data *data, bool charset_found = FALSE; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); str = t_str_new(256); if (rfc822_parse_content_type(&parser, str) < 0) @@ -94,7 +94,7 @@ static void parse_content_transfer_encoding(struct message_part_body_data *data, string_t *str; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); str = t_str_new(256); if (rfc822_parse_mime_token(&parser, str) >= 0) { @@ -112,7 +112,7 @@ static void parse_content_disposition(struct message_part_body_data *data, string_t *str; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); str = t_str_new(256); if (rfc822_parse_mime_token(&parser, str) < 0) @@ -151,14 +151,14 @@ static void parse_content_language(const unsigned char *value, size_t value_len, str = t_str_new(128); str_append_c(str, '"'); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); while (rfc822_parse_atom(&parser, str) >= 0) { str_append(str, "\" \""); if (parser.data == parser.end || *parser.data != ',') break; parser.data++; - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); } if (str_len(str) > 1) { diff --git a/src/lib-mail/message-date.c b/src/lib-mail/message-date.c index aa90d5d590..72e4a5f56b 100644 --- a/src/lib-mail/message-date.c +++ b/src/lib-mail/message-date.c @@ -123,7 +123,7 @@ message_date_parser_tokens(struct message_date_parser_context *ctx, /* [weekday_name "," ] dd month_name [yy]yy hh:mi[:ss] timezone */ memset(&tm, 0, sizeof(tm)); - (void)rfc822_skip_lwsp(&ctx->parser); + rfc822_skip_lwsp(&ctx->parser); /* skip the optional weekday */ if (next_token(ctx, &value, &len) <= 0) @@ -132,7 +132,7 @@ message_date_parser_tokens(struct message_date_parser_context *ctx, if (*ctx->parser.data != ',') return FALSE; ctx->parser.data++; - (void)rfc822_skip_lwsp(&ctx->parser); + rfc822_skip_lwsp(&ctx->parser); if (next_token(ctx, &value, &len) <= 0) return FALSE; @@ -197,7 +197,7 @@ message_date_parser_tokens(struct message_date_parser_context *ctx, if (!IS_TIME_SEP(*ctx->parser.data)) return FALSE; ctx->parser.data++; - (void)rfc822_skip_lwsp(&ctx->parser); + rfc822_skip_lwsp(&ctx->parser); if (next_token(ctx, &value, &len) < 0 || len != 2 || !i_isdigit(value[0]) || !i_isdigit(value[1])) @@ -208,7 +208,7 @@ message_date_parser_tokens(struct message_date_parser_context *ctx, if (ctx->parser.data != ctx->parser.end && IS_TIME_SEP(*ctx->parser.data)) { ctx->parser.data++; - (void)rfc822_skip_lwsp(&ctx->parser); + rfc822_skip_lwsp(&ctx->parser); if (next_token(ctx, &value, &len) <= 0 || len != 2 || !i_isdigit(value[0]) || !i_isdigit(value[1])) diff --git a/src/lib-mail/message-decoder.c b/src/lib-mail/message-decoder.c index 047bff4ee9..c2d11e2f50 100644 --- a/src/lib-mail/message-decoder.c +++ b/src/lib-mail/message-decoder.c @@ -102,7 +102,7 @@ parse_content_transfer_encoding(struct message_decoder_context *ctx, value = t_str_new(64); rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); (void)rfc822_parse_mime_token(&parser, value); ctx->content_type = CONTENT_TYPE_UNKNOWN; @@ -137,7 +137,7 @@ parse_content_type(struct message_decoder_context *ctx, return; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); str = t_str_new(64); if (rfc822_parse_content_type(&parser, str) <= 0) return; diff --git a/src/lib-mail/message-id.c b/src/lib-mail/message-id.c index 420c3ef822..093ee53243 100644 --- a/src/lib-mail/message-id.c +++ b/src/lib-mail/message-id.c @@ -21,7 +21,7 @@ static bool get_untokenized_msgid(const char **msgid_p, string_t *msgid) no-fold-literal = "[" *(dtext / quoted-pair) "]" */ - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); if (*parser.data == '"') ret = rfc822_parse_quoted_string(&parser, msgid); @@ -34,7 +34,7 @@ static bool get_untokenized_msgid(const char **msgid_p, string_t *msgid) return FALSE; str_append_c(msgid, '@'); parser.data++; - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); if (rfc822_parse_dot_atom(&parser, msgid) <= 0) return FALSE; diff --git a/src/lib-mail/message-parser.c b/src/lib-mail/message-parser.c index 75cbbb3de2..66fa6667df 100644 --- a/src/lib-mail/message-parser.c +++ b/src/lib-mail/message-parser.c @@ -464,7 +464,7 @@ static void parse_content_type(struct message_parser_ctx *ctx, ctx->part_seen_content_type = TRUE; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); content_type = t_str_new(64); if (rfc822_parse_content_type(&parser, content_type) < 0) diff --git a/src/lib-mail/message-search.c b/src/lib-mail/message-search.c index ff85676f6f..4652732a9e 100644 --- a/src/lib-mail/message-search.c +++ b/src/lib-mail/message-search.c @@ -55,7 +55,7 @@ static void parse_content_type(struct message_search_context *ctx, string_t *content_type; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); content_type = t_str_new(64); if (rfc822_parse_content_type(&parser, content_type) >= 0) { diff --git a/src/lib-mail/rfc822-parser.h b/src/lib-mail/rfc822-parser.h index 7d2b87e040..87e9aa23dc 100644 --- a/src/lib-mail/rfc822-parser.h +++ b/src/lib-mail/rfc822-parser.h @@ -26,7 +26,8 @@ void rfc822_parser_init(struct rfc822_parser_context *ctx, /* Parse comment. Assumes parser's data points to '(' */ int rfc822_skip_comment(struct rfc822_parser_context *ctx); /* Skip LWSP if there is any */ -int rfc822_skip_lwsp(struct rfc822_parser_context *ctx); +int ATTR_NOWARN_UNUSED_RESULT +rfc822_skip_lwsp(struct rfc822_parser_context *ctx); /* Stop at next non-atext char */ int rfc822_parse_atom(struct rfc822_parser_context *ctx, string_t *str); /* Like parse_atom() but don't stop at '.' */ diff --git a/src/lib-storage/index/index-attachment.c b/src/lib-storage/index/index-attachment.c index 4f9841efe5..ccdce454f3 100644 --- a/src/lib-storage/index/index-attachment.c +++ b/src/lib-storage/index/index-attachment.c @@ -98,7 +98,7 @@ static void parse_content_type(struct mail_save_context *ctx, string_t *content_type; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); T_BEGIN { content_type = t_str_new(64); diff --git a/src/lib/hash.c b/src/lib/hash.c index b790093e61..124f103fc0 100644 --- a/src/lib/hash.c +++ b/src/lib/hash.c @@ -176,7 +176,7 @@ bool hash_table_lookup_full(const struct hash_table *table, return TRUE; } -static struct hash_node * +static struct hash_node * ATTR_NOWARN_UNUSED_RESULT hash_table_insert_node(struct hash_table *table, void *key, void *value, bool check_existing) { @@ -265,7 +265,7 @@ void hash_table_insert(struct hash_table *table, void *key, void *value) void hash_table_update(struct hash_table *table, void *key, void *value) { - (void)hash_table_insert_node(table, key, value, TRUE); + hash_table_insert_node(table, key, value, TRUE); } static void @@ -438,16 +438,16 @@ static bool hash_table_resize(struct hash_table *table, bool grow) for (i = 0; i < old_size; i++) { node = &old_nodes[i]; if (node->key != NULL) { - (void)hash_table_insert_node(table, node->key, - node->value, FALSE); + hash_table_insert_node(table, node->key, + node->value, FALSE); } for (node = node->next; node != NULL; node = next) { next = node->next; if (node->key != NULL) { - (void)hash_table_insert_node(table, node->key, - node->value, FALSE); + hash_table_insert_node(table, node->key, + node->value, FALSE); } free_node(table, node); } diff --git a/src/lib/md4.c b/src/lib/md4.c index 2a5a294ffd..295567c87e 100644 --- a/src/lib/md4.c +++ b/src/lib/md4.c @@ -62,7 +62,8 @@ * This processes one or more 64-byte data blocks, but does NOT update * the bit counters. There're no alignment requirements. */ -static const void *body(struct md4_context *ctx, const void *data, size_t size) +static const void * ATTR_NOWARN_UNUSED_RESULT +body(struct md4_context *ctx, const void *data, size_t size) { const unsigned char *ptr; uint32_t a, b, c, d; @@ -193,7 +194,7 @@ void md4_update(struct md4_context *ctx, const void *data, size_t size) memcpy(&ctx->buffer[used], data, free); data = (const unsigned char *) data + free; size -= free; - (void)body(ctx, ctx->buffer, 64); + body(ctx, ctx->buffer, 64); } if (size >= 64) { @@ -217,7 +218,7 @@ void md4_final(struct md4_context *ctx, unsigned char result[MD4_RESULTLEN]) if (free < 8) { memset(&ctx->buffer[used], 0, free); - (void)body(ctx, ctx->buffer, 64); + body(ctx, ctx->buffer, 64); used = 0; free = 64; } @@ -234,7 +235,7 @@ void md4_final(struct md4_context *ctx, unsigned char result[MD4_RESULTLEN]) ctx->buffer[62] = ctx->hi >> 16; ctx->buffer[63] = ctx->hi >> 24; - (void)body(ctx, ctx->buffer, 64); + body(ctx, ctx->buffer, 64); result[0] = ctx->a; result[1] = ctx->a >> 8; diff --git a/src/lib/md5.c b/src/lib/md5.c index 3bd394c71a..5581d757bd 100644 --- a/src/lib/md5.c +++ b/src/lib/md5.c @@ -66,7 +66,8 @@ * This processes one or more 64-byte data blocks, but does NOT update * the bit counters. There're no alignment requirements. */ -static const void *body(struct md5_context *ctx, const void *data, size_t size) +static const void * ATTR_NOWARN_UNUSED_RESULT +body(struct md5_context *ctx, const void *data, size_t size) { const unsigned char *ptr; uint_fast32_t a, b, c, d; @@ -208,7 +209,7 @@ void md5_update(struct md5_context *ctx, const void *data, size_t size) memcpy(&ctx->buffer[used], data, free); data = (const unsigned char *) data + free; size -= free; - (void)body(ctx, ctx->buffer, 64); + body(ctx, ctx->buffer, 64); } if (size >= 64) { @@ -232,7 +233,7 @@ void md5_final(struct md5_context *ctx, unsigned char result[MD5_RESULTLEN]) if (free < 8) { memset(&ctx->buffer[used], 0, free); - (void)body(ctx, ctx->buffer, 64); + body(ctx, ctx->buffer, 64); used = 0; free = 64; } @@ -249,7 +250,7 @@ void md5_final(struct md5_context *ctx, unsigned char result[MD5_RESULTLEN]) ctx->buffer[62] = ctx->hi >> 16; ctx->buffer[63] = ctx->hi >> 24; - (void)body(ctx, ctx->buffer, 64); + body(ctx, ctx->buffer, 64); result[0] = ctx->a; result[1] = ctx->a >> 8; diff --git a/src/lib/ostream.c b/src/lib/ostream.c index 7adc950e65..83b565d7e6 100644 --- a/src/lib/ostream.c +++ b/src/lib/ostream.c @@ -213,7 +213,7 @@ void o_stream_nsend(struct ostream *stream, const void *data, size_t size) iov.iov_base = data; iov.iov_len = size; - (void)o_stream_nsendv(stream, &iov, 1); + o_stream_nsendv(stream, &iov, 1); } void o_stream_nsendv(struct ostream *stream, const struct const_iovec *iov, diff --git a/src/plugins/fts/fts-build-mail.c b/src/plugins/fts/fts-build-mail.c index c6cec4314f..a60c1543a9 100644 --- a/src/plugins/fts/fts-build-mail.c +++ b/src/plugins/fts/fts-build-mail.c @@ -37,7 +37,7 @@ static void fts_build_parse_content_type(struct fts_mail_build_context *ctx, string_t *content_type; rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); T_BEGIN { content_type = t_str_new(64); diff --git a/src/plugins/fts/fts-parser-script.c b/src/plugins/fts/fts-parser-script.c index 4edc2b50a0..534fd1216f 100644 --- a/src/plugins/fts/fts-parser-script.c +++ b/src/plugins/fts/fts-parser-script.c @@ -162,7 +162,7 @@ static void parse_content_disposition(const char *content_disposition, rfc822_parser_init(&parser, (const unsigned char *)content_disposition, strlen(content_disposition), NULL); - (void)rfc822_skip_lwsp(&parser); + rfc822_skip_lwsp(&parser); /* type; param; param; .. */ str = t_str_new(32);