Add (void) to some macros to satisfy compiler.

More modern versions of GCC (at least with aarch64) are warning about an
unused value in these locations. It's incorrect, but I guess that the
macro is confusing it.

Using a (void) tag is a little ugly but solves the problem.

Change-Id: If6ba5083ab6e501c81e7743ae1ed99a89565e57c
Reviewed-on: https://boringssl-review.googlesource.com/2810
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2015-01-09 15:42:58 -08:00
parent f9a40b2ce5
commit a307dfd29f
3 changed files with 3 additions and 3 deletions

View File

@ -801,7 +801,7 @@ int SSL_add_file_cert_subjects_to_stack(STACK_OF(X509_NAME) * stack,
X509_free(x); X509_free(x);
} }
sk_X509_NAME_set_cmp_func(stack, oldcmp); (void) sk_X509_NAME_set_cmp_func(stack, oldcmp);
return ret; return ret;
} }

View File

@ -1127,7 +1127,7 @@ ssl_create_cipher_list(const SSL_PROTOCOL_METHOD *ssl_method,
} }
*cipher_list_by_id = tmp_cipher_list; *cipher_list_by_id = tmp_cipher_list;
tmp_cipher_list = NULL; tmp_cipher_list = NULL;
sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id, ssl_cipher_ptr_id_cmp); (void) sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id, ssl_cipher_ptr_id_cmp);
sk_SSL_CIPHER_sort(*cipher_list_by_id); sk_SSL_CIPHER_sort(*cipher_list_by_id);
} else { } else {

View File

@ -764,7 +764,7 @@ static void timeout_doall_arg(SSL_SESSION *sess, void *void_param) {
/* timeout */ /* timeout */
/* The reason we don't call SSL_CTX_remove_session() is to /* The reason we don't call SSL_CTX_remove_session() is to
* save on locking overhead */ * save on locking overhead */
lh_SSL_SESSION_delete(param->cache, sess); (void) lh_SSL_SESSION_delete(param->cache, sess);
SSL_SESSION_list_remove(param->ctx, sess); SSL_SESSION_list_remove(param->ctx, sess);
sess->not_resumable = 1; sess->not_resumable = 1;
if (param->ctx->remove_session_cb != NULL) { if (param->ctx->remove_session_cb != NULL) {