diff --git a/configure.ac b/configure.ac index a52e8924..977ecb50 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ WARNING_FLAGS="-Wall" AS_CASE([$PLATFORM], [haiku], [], - [WARNING_FLAGS="$WARNING_FLAGS -Wextra -Wno-unused-parameter"]) + [WARNING_FLAGS="$WARNING_FLAGS -Wextra"]) AC_ARG_WITH([libxml2], [AS_HELP_STRING([--with-libxml2], [use libxml2 for XML parsing, expat is the default])]) diff --git a/examples/active.c b/examples/active.c index eae3b340..110f42c7 100644 --- a/examples/active.c +++ b/examples/active.c @@ -26,6 +26,8 @@ int handle_reply(xmpp_conn_t *const conn, xmpp_stanza_t *query, *item; const char *type; + (void)userdata; + type = xmpp_stanza_get_type(stanza); if (strcmp(type, "error") == 0) fprintf(stderr, "ERROR: query failed\n"); @@ -53,6 +55,9 @@ void conn_handler(xmpp_conn_t *const conn, xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_stanza_t *iq, *query; + (void)error; + (void)stream_error; + if (status == XMPP_CONN_CONNECT) { fprintf(stderr, "DEBUG: connected\n"); diff --git a/examples/basic.c b/examples/basic.c index b9084d73..162a1740 100644 --- a/examples/basic.c +++ b/examples/basic.c @@ -28,6 +28,9 @@ void conn_handler(xmpp_conn_t *const conn, xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; int secured; + (void)error; + (void)stream_error; + if (status == XMPP_CONN_CONNECT) { fprintf(stderr, "DEBUG: connected\n"); secured = xmpp_conn_is_secured(conn); diff --git a/examples/bot.c b/examples/bot.c index 7aa9dd32..cc5c28d8 100644 --- a/examples/bot.c +++ b/examples/bot.c @@ -126,6 +126,9 @@ void conn_handler(xmpp_conn_t *const conn, { xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; + (void)error; + (void)stream_error; + if (status == XMPP_CONN_CONNECT) { xmpp_stanza_t *pres; fprintf(stderr, "DEBUG: connected\n"); diff --git a/examples/component.c b/examples/component.c index b70976e6..219f0d2e 100644 --- a/examples/component.c +++ b/examples/component.c @@ -28,6 +28,9 @@ void conn_handler(xmpp_conn_t *const conn, { xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; + (void)error; + (void)stream_error; + if (status == XMPP_CONN_CONNECT) { fprintf(stderr, "DEBUG: connected\n"); xmpp_disconnect(conn); diff --git a/examples/register.c b/examples/register.c index 80e32e30..2b26fddd 100644 --- a/examples/register.c +++ b/examples/register.c @@ -106,6 +106,8 @@ static int iq_reg2_cb(xmpp_conn_t *const conn, { const char *type; + (void)userdata; + type = xmpp_stanza_get_type(stanza); if (!type || strcmp(type, "error") == 0) { fprintf(stderr, "DEBUG: error during registration\n"); @@ -166,6 +168,9 @@ static int _handle_error(xmpp_conn_t *const conn, xmpp_stanza_t *const stanza, void *const userdata) { + (void)stanza; + (void)userdata; + fprintf(stderr, "DEBUG: received stream error\n"); xmpp_disconnect(conn); @@ -178,6 +183,8 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn, { const char *name = xmpp_stanza_get_name(stanza); + (void)userdata; + if (strcmp(name, "proceed") == 0) { fprintf(stderr, "DEBUG: proceeding with TLS\n"); if (xmpp_conn_tls_start(conn) == 0) { @@ -195,6 +202,8 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn, static int _handle_missing_features(xmpp_conn_t *const conn, void *const userdata) { + (void)userdata; + fprintf(stderr, "DEBUG: timeout\n"); xmpp_disconnect(conn); @@ -263,6 +272,9 @@ static void conn_handler(xmpp_conn_t *const conn, xmpp_reg_t *reg = (xmpp_reg_t *)userdata; int secured; + (void)error; + (void)stream_error; + if (status == XMPP_CONN_RAW_CONNECT) { fprintf(stderr, "DEBUG: raw connection established\n"); xmpp_conn_open_stream_default(conn); diff --git a/examples/roster.c b/examples/roster.c index 479a21be..dcd6f5c7 100644 --- a/examples/roster.c +++ b/examples/roster.c @@ -25,6 +25,8 @@ int handle_reply(xmpp_conn_t *const conn, xmpp_stanza_t *query, *item; const char *type, *name; + (void)userdata; + type = xmpp_stanza_get_type(stanza); if (strcmp(type, "error") == 0) fprintf(stderr, "ERROR: query failed\n"); @@ -58,6 +60,9 @@ void conn_handler(xmpp_conn_t *const conn, xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata; xmpp_stanza_t *iq, *query; + (void)error; + (void)stream_error; + if (status == XMPP_CONN_CONNECT) { fprintf(stderr, "DEBUG: connected\n"); diff --git a/examples/uuid.c b/examples/uuid.c index 8e01d865..af790c37 100644 --- a/examples/uuid.c +++ b/examples/uuid.c @@ -1,7 +1,7 @@ #include #include -int main(int argc, char **argv) +int main() { xmpp_ctx_t *ctx; char *uuid; diff --git a/examples/vcard.c b/examples/vcard.c index 6f0300f2..57e115d4 100644 --- a/examples/vcard.c +++ b/examples/vcard.c @@ -162,6 +162,8 @@ static vcard_cb_t vcard_cb_get(xmpp_stanza_t *stanza) static int timedout(xmpp_conn_t *const conn, void *const userdata) { + (void)userdata; + fprintf(stderr, "Timeout reached.\n"); xmpp_disconnect(conn); diff --git a/src/auth.c b/src/auth.c index a5f5acbd..31732ae7 100644 --- a/src/auth.c +++ b/src/auth.c @@ -109,6 +109,8 @@ static int _handle_error(xmpp_conn_t *const conn, xmpp_stanza_t *child; const char *name; + UNUSED(userdata); + /* free old stream error if it's still there */ if (conn->stream_error) { xmpp_stanza_release(conn->stream_error->stanza); @@ -200,6 +202,8 @@ static int _handle_error(xmpp_conn_t *const conn, static int _handle_missing_features(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_debug(conn->ctx, "xmpp", "didn't get stream features"); /* legacy auth will be attempted */ @@ -216,6 +220,8 @@ static int _handle_features(xmpp_conn_t *const conn, const char *ns; char *text; + UNUSED(userdata); + /* remove the handler that detects missing stream:features */ xmpp_timed_handler_delete(conn, _handle_missing_features); @@ -293,6 +299,8 @@ static int _handle_proceedtls_default(xmpp_conn_t *const conn, { const char *name; + UNUSED(userdata); + name = xmpp_stanza_get_name(stanza); xmpp_debug(conn->ctx, "xmpp", "handle proceedtls called for %s", name); @@ -357,6 +365,8 @@ static int _handle_digestmd5_challenge(xmpp_conn_t *const conn, xmpp_stanza_t *auth, *authdata; const char *name; + UNUSED(userdata); + name = xmpp_stanza_get_name(stanza); xmpp_debug(conn->ctx, "xmpp", "handle digest-md5 (challenge) called for %s", name); @@ -412,6 +422,8 @@ static int _handle_digestmd5_rspauth(xmpp_conn_t *const conn, xmpp_stanza_t *auth; const char *name; + UNUSED(userdata); + name = xmpp_stanza_get_name(stanza); xmpp_debug(conn->ctx, "xmpp", "handle digest-md5 (rspauth) called for %s", name); @@ -825,6 +837,8 @@ static int _handle_features_sasl(xmpp_conn_t *const conn, const char *ns; char *resource; + UNUSED(userdata); + /* remove missing features handler */ xmpp_timed_handler_delete(conn, _handle_missing_features_sasl); @@ -925,6 +939,8 @@ static int _handle_features_sasl(xmpp_conn_t *const conn, static int _handle_missing_features_sasl(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_error(conn->ctx, "xmpp", "Did not receive stream features " "after SASL authentication."); @@ -939,6 +955,8 @@ static int _handle_bind(xmpp_conn_t *const conn, const char *type; xmpp_stanza_t *iq, *session; + UNUSED(userdata); + /* delete missing bind handler */ xmpp_timed_handler_delete(conn, _handle_missing_bind); @@ -1006,6 +1024,8 @@ static int _handle_bind(xmpp_conn_t *const conn, static int _handle_missing_bind(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_error(conn->ctx, "xmpp", "Server did not reply to bind request."); xmpp_disconnect(conn); return 0; @@ -1017,6 +1037,8 @@ static int _handle_session(xmpp_conn_t *const conn, { const char *type; + UNUSED(userdata); + /* delete missing session handler */ xmpp_timed_handler_delete(conn, _handle_missing_session); @@ -1043,6 +1065,8 @@ static int _handle_session(xmpp_conn_t *const conn, static int _handle_missing_session(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_error(conn->ctx, "xmpp", "Server did not reply to session request."); xmpp_disconnect(conn); return 0; @@ -1050,6 +1074,8 @@ static int _handle_missing_session(xmpp_conn_t *const conn, static int _handle_missing_legacy(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_error(conn->ctx, "xmpp", "Server did not reply to legacy " "authentication request."); @@ -1064,6 +1090,8 @@ static int _handle_legacy(xmpp_conn_t *const conn, const char *type; const char *name; + UNUSED(userdata); + /* delete missing handler */ xmpp_timed_handler_delete(conn, _handle_missing_legacy); @@ -1264,6 +1292,8 @@ int _handle_component_hs_response(xmpp_conn_t *const conn, { const char *name; + UNUSED(userdata); + xmpp_timed_handler_delete(conn, _handle_missing_handshake); name = xmpp_stanza_get_name(stanza); @@ -1290,6 +1320,8 @@ int _handle_component_hs_response(xmpp_conn_t *const conn, int _handle_missing_handshake(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_error(conn->ctx, "xmpp", "Server did not reply to handshake request."); xmpp_disconnect(conn); return 0; diff --git a/src/common.h b/src/common.h index 0d43839c..51247dba 100644 --- a/src/common.h +++ b/src/common.h @@ -130,6 +130,8 @@ struct _xmpp_handlist_t { } u; }; +#define UNUSED(x) ((void)(x)) + #define MAX_DOMAIN_LEN 256 #define SASL_MASK_PLAIN (1 << 0) diff --git a/src/conn.c b/src/conn.c index fdd4b870..2d779d3e 100644 --- a/src/conn.c +++ b/src/conn.c @@ -1065,6 +1065,8 @@ int xmpp_conn_is_disconnected(xmpp_conn_t *const conn) /* timed handler for cleanup if normal disconnect procedure takes too long */ static int _disconnect_cleanup(xmpp_conn_t *const conn, void *const userdata) { + UNUSED(userdata); + xmpp_debug(conn->ctx, "xmpp", "disconnection forced by cleanup timeout"); conn_disconnect(conn); @@ -1229,6 +1231,8 @@ static void _handle_stream_end(char *name, void *const userdata) { xmpp_conn_t *conn = (xmpp_conn_t *)userdata; + UNUSED(name); + /* stream is over */ xmpp_debug(conn->ctx, "xmpp", "RECV: "); conn_disconnect_clean(conn); diff --git a/src/ctx.c b/src/ctx.c index 3eb0061c..f1b9784e 100644 --- a/src/ctx.c +++ b/src/ctx.c @@ -123,16 +123,19 @@ int xmpp_version_check(int major, int minor) */ static void *_malloc(const size_t size, void *const userdata) { + UNUSED(userdata); return malloc(size); } static void _free(void *p, void *const userdata) { + UNUSED(userdata); free(p); } static void *_realloc(void *p, const size_t size, void *const userdata) { + UNUSED(userdata); return realloc(p, size); } diff --git a/src/parser_libxml2.c b/src/parser_libxml2.c index 06dddc3c..c0167d94 100644 --- a/src/parser_libxml2.c +++ b/src/parser_libxml2.c @@ -123,6 +123,11 @@ static void _start_element(void *userdata, xmpp_stanza_t *child; char **cbattrs; + UNUSED(prefix); + UNUSED(nnamespaces); + UNUSED(namespaces); + UNUSED(ndefaulted); + if (parser->depth == 0) { /* notify the owner */ if (parser->startcb) { @@ -178,6 +183,9 @@ static void _end_element(void *userdata, { parser_t *parser = (parser_t *)userdata; + UNUSED(prefix); + UNUSED(uri); + parser->depth--; if (parser->depth == 0) { diff --git a/src/resolver.c b/src/resolver.c index dbff2037..e8e6f49f 100644 --- a/src/resolver.c +++ b/src/resolver.c @@ -500,6 +500,8 @@ static void ares_srv_lookup_callback( { struct resolver_ares_ctx *actx = arg; + (void)timeouts; + if (status != ARES_SUCCESS) actx->result = XMPP_DOMAIN_NOT_FOUND; else diff --git a/src/sasl.c b/src/sasl.c index 728eaa7c..3ba68ead 100644 --- a/src/sasl.c +++ b/src/sasl.c @@ -184,6 +184,8 @@ static char *_add_key(xmpp_ctx_t *ctx, const char *value, *qvalue; char *c; + UNUSED(len); + /* allocate a zero-length string if necessary */ if (buf == NULL) { buf = xmpp_alloc(ctx, 1); @@ -405,6 +407,8 @@ char *sasl_scram(xmpp_ctx_t *ctx, size_t response_len; size_t auth_len; + UNUSED(jid); + tmp = xmpp_strdup(ctx, challenge); if (!tmp) { return NULL; diff --git a/src/tls_dummy.c b/src/tls_dummy.c index 4494d502..5eb99878 100644 --- a/src/tls_dummy.c +++ b/src/tls_dummy.c @@ -35,57 +35,73 @@ void tls_shutdown(void) tls_t *tls_new(xmpp_conn_t *conn) { + UNUSED(conn); /* always fail */ return NULL; } void tls_free(tls_t *tls) { + UNUSED(tls); return; } int tls_set_credentials(tls_t *tls, const char *cafilename) { + UNUSED(tls); + UNUSED(cafilename); return -1; } int tls_start(tls_t *tls) { + UNUSED(tls); return -1; } int tls_stop(tls_t *tls) { + UNUSED(tls); return -1; } int tls_error(tls_t *tls) { + UNUSED(tls); /* todo: some kind of error polling/dump */ return 0; } int tls_pending(tls_t *tls) { + UNUSED(tls); return 0; } int tls_read(tls_t *tls, void *const buff, const size_t len) { + UNUSED(tls); + UNUSED(buff); + UNUSED(len); return -1; } int tls_write(tls_t *tls, const void *const buff, const size_t len) { + UNUSED(tls); + UNUSED(buff); + UNUSED(len); return -1; } int tls_clear_pending_write(tls_t *tls) { + UNUSED(tls); return -1; } int tls_is_recoverable(int error) { + UNUSED(error); return 0; } diff --git a/src/tls_gnutls.c b/src/tls_gnutls.c index 23cf1d0f..9aa422e8 100644 --- a/src/tls_gnutls.c +++ b/src/tls_gnutls.c @@ -142,5 +142,6 @@ int tls_write(tls_t *tls, const void *const buff, const size_t len) int tls_clear_pending_write(tls_t *tls) { + UNUSED(tls); return 0; } diff --git a/src/tls_openssl.c b/src/tls_openssl.c index a540a6b8..b92d10f3 100644 --- a/src/tls_openssl.c +++ b/src/tls_openssl.c @@ -203,6 +203,8 @@ void tls_free(tls_t *tls) int tls_set_credentials(tls_t *tls, const char *cafilename) { + UNUSED(tls); + UNUSED(cafilename); return -1; } @@ -305,6 +307,7 @@ int tls_write(tls_t *tls, const void *const buff, const size_t len) int tls_clear_pending_write(tls_t *tls) { + UNUSED(tls); return 0; } diff --git a/src/tls_schannel.c b/src/tls_schannel.c index ad7172d6..3532c361 100644 --- a/src/tls_schannel.c +++ b/src/tls_schannel.c @@ -209,6 +209,8 @@ void tls_free(tls_t *tls) int tls_set_credentials(tls_t *tls, const char *cafilename) { + UNUSED(tls); + UNUSED(cafilename); return -1; } @@ -377,6 +379,7 @@ int tls_start(tls_t *tls) int tls_stop(tls_t *tls) { + UNUSED(tls); return -1; } diff --git a/tests/check_parser.c b/tests/check_parser.c index bedf6a7b..656d61e7 100644 --- a/tests/check_parser.c +++ b/tests/check_parser.c @@ -43,6 +43,9 @@ static void create_destroy(void) int cbtest_got_start = 0; void cbtest_handle_start(char *name, char **attrs, void *userdata) { + (void)attrs; + (void)userdata; + if (strcmp(name, "stream") == 0) cbtest_got_start = 1; } @@ -50,6 +53,8 @@ void cbtest_handle_start(char *name, char **attrs, void *userdata) int cbtest_got_end = 0; void cbtest_handle_end(char *name, void *userdata) { + (void)userdata; + if (strcmp(name, "stream") == 0) cbtest_got_end = 1; } @@ -57,6 +62,8 @@ void cbtest_handle_end(char *name, void *userdata) int cbtest_got_stanza = 0; void cbtest_handle_stanza(xmpp_stanza_t *stanza, void *userdata) { + (void)userdata; + if (strcmp(xmpp_stanza_get_name(stanza), "message") == 0) cbtest_got_stanza = 1; } diff --git a/tests/test_base64.c b/tests/test_base64.c index 31de6d00..a80cb9a9 100644 --- a/tests/test_base64.c +++ b/tests/test_base64.c @@ -113,7 +113,7 @@ static const unsigned char bin_data[] = { 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00, }; -int main(int argc, char *argv[]) +int main() { xmpp_ctx_t *ctx; unsigned char *udec; diff --git a/tests/test_ctx.c b/tests/test_ctx.c index be357f55..5de7b035 100644 --- a/tests/test_ctx.c +++ b/tests/test_ctx.c @@ -24,18 +24,24 @@ static int mem_realloc_called = 0; void *my_alloc(const size_t size, void *const userdata) { + (void)userdata; + mem_alloc_called++; return malloc(size); } void my_free(void *p, void *const userdata) { + (void)userdata; + mem_free_called++; return free(p); } void *my_realloc(void *p, const size_t size, void *const userdata) { + (void)userdata; + mem_realloc_called++; return realloc(p, size); } @@ -50,7 +56,7 @@ void my_logger(void *const userdata, log_called++; } -int main(int argc, char **argv) +int main() { xmpp_ctx_t *ctx; xmpp_mem_t mymem; diff --git a/tests/test_jid.c b/tests/test_jid.c index 8f0f4ed1..d3e03bcb 100644 --- a/tests/test_jid.c +++ b/tests/test_jid.c @@ -146,7 +146,7 @@ int test_jid_new(xmpp_ctx_t *ctx) return 0; } -int main(int argc, char *argv[]) +int main() { xmpp_ctx_t *ctx; int ret; diff --git a/tests/test_md5.c b/tests/test_md5.c index 2a59038e..5d9c7fe4 100644 --- a/tests/test_md5.c +++ b/tests/test_md5.c @@ -57,7 +57,7 @@ static const struct { }, }; -int main(int argc, char **argv) +int main() { struct MD5Context ctx; unsigned char digest[16]; diff --git a/tests/test_rand.c b/tests/test_rand.c index 2a488985..85dedddd 100644 --- a/tests/test_rand.c +++ b/tests/test_rand.c @@ -23,13 +23,25 @@ /* stubs to build test without whole libstrophe */ void *xmpp_alloc(const xmpp_ctx_t *const ctx, const size_t size) { + (void)ctx; + (void)size; return NULL; } -void xmpp_free(const xmpp_ctx_t *const ctx, void *p) {} + +void xmpp_free(const xmpp_ctx_t *const ctx, void *p) +{ + (void)ctx; + (void)p; +} + int xmpp_snprintf(char *str, size_t count, const char *fmt, ...) { + (void)str; + (void)count; + (void)fmt; return 0; } + uint64_t time_stamp(void) { return 0; diff --git a/tests/test_resolver.c b/tests/test_resolver.c index 0c33b816..59b9ed75 100644 --- a/tests/test_resolver.c +++ b/tests/test_resolver.c @@ -170,7 +170,7 @@ static int srv_rr_list_len(resolver_srv_rr_t *list) return nr; } -int main(int argc, char **argv) +int main() { xmpp_ctx_t *ctx; xmpp_rand_t *rand; diff --git a/tests/test_sasl.c b/tests/test_sasl.c index 8701f943..fadc1e7c 100644 --- a/tests/test_sasl.c +++ b/tests/test_sasl.c @@ -80,7 +80,7 @@ int test_digest_md5(xmpp_ctx_t *ctx) return 0; } -int main(int argc, char *argv[]) +int main() { xmpp_ctx_t *ctx; int ret; diff --git a/tests/test_scram.c b/tests/test_scram.c index af90e7b1..7d92438b 100644 --- a/tests/test_scram.c +++ b/tests/test_scram.c @@ -203,7 +203,7 @@ static void test_hmac(const struct hash_alg *alg) } } -int main(int argc, char **argv) +int main() { test_df(&scram_sha1); test_scram(&scram_sha1); diff --git a/tests/test_sha1.c b/tests/test_sha1.c index ee4115b4..c0e2fa9c 100644 --- a/tests/test_sha1.c +++ b/tests/test_sha1.c @@ -37,7 +37,7 @@ static void digest_to_hex(const uint8_t *digest, char *output) *(c - 1) = '\0'; } -int main(int argc, char **argv) +int main() { size_t k; SHA1_CTX context; diff --git a/tests/test_sha256.c b/tests/test_sha256.c index 4a484e96..ecec4dad 100644 --- a/tests/test_sha256.c +++ b/tests/test_sha256.c @@ -10,7 +10,7 @@ #include "sha256.h" #include "test.h" -int main(int argc, char **argv) +int main() { static const struct { const char *msg; diff --git a/tests/test_sha512.c b/tests/test_sha512.c index a19270dd..fa880a4f 100644 --- a/tests/test_sha512.c +++ b/tests/test_sha512.c @@ -18,7 +18,7 @@ static const uint8_t hash_1m_a[SHA512_DIGEST_SIZE] = { 0xe5, 0x77, 0xc3, 0x1b, 0xeb, 0x00, 0x9c, 0x5c, 0x2c, 0x49, 0xaa, 0x2e, 0x4e, 0xad, 0xb2, 0x17, 0xad, 0x8c, 0xc0, 0x9b}; -int main(int argc, char **argv) +int main() { static const struct { const char *msg; diff --git a/tests/test_sock.c b/tests/test_sock.c index 62b23f06..3605083c 100644 --- a/tests/test_sock.c +++ b/tests/test_sock.c @@ -40,7 +40,7 @@ int wait_for_connect(sock_t sock) return -1; } -int main(int argc, char **argv) +int main() { sock_t sock; int err;