From 3063d886bd2936df587d36dfd3bfd93b6123d3c2 Mon Sep 17 00:00:00 2001 From: Dmitry Podgorny Date: Tue, 31 Mar 2020 18:56:02 +0300 Subject: [PATCH] sasl: remove unused argument _add_key() is a static function which is used only for DIGEST_MD5. Its argument 'len' is not used and remains 0. Remove it. --- src/sasl.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/src/sasl.c b/src/sasl.c index 3ba68ea..0ad6d7a 100644 --- a/src/sasl.c +++ b/src/sasl.c @@ -172,20 +172,14 @@ static void _digest_to_hex(const char *digest, char *hex) } /** append 'key="value"' to a buffer, growing as necessary */ -static char *_add_key(xmpp_ctx_t *ctx, - hash_t *table, - const char *key, - char *buf, - int *len, - int quote) +static char * +_add_key(xmpp_ctx_t *ctx, hash_t *table, const char *key, char *buf, int quote) { int olen, nlen; int keylen, valuelen; const char *value, *qvalue; char *c; - UNUSED(len); - /* allocate a zero-length string if necessary */ if (buf == NULL) { buf = xmpp_alloc(ctx, 1); @@ -242,7 +236,6 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, char *node, *domain, *realm; char *value; char *response; - int rlen; struct MD5Context MD5; unsigned char digest[16], HA1[16], HA2[16]; char hex[32]; @@ -358,16 +351,15 @@ char *sasl_digest_md5(xmpp_ctx_t *ctx, /* construct reply */ result = NULL; - rlen = 0; - result = _add_key(ctx, table, "username", result, &rlen, 1); - result = _add_key(ctx, table, "realm", result, &rlen, 1); - result = _add_key(ctx, table, "nonce", result, &rlen, 1); - result = _add_key(ctx, table, "cnonce", result, &rlen, 1); - result = _add_key(ctx, table, "nc", result, &rlen, 0); - result = _add_key(ctx, table, "qop", result, &rlen, 0); - result = _add_key(ctx, table, "digest-uri", result, &rlen, 1); - result = _add_key(ctx, table, "response", result, &rlen, 0); - result = _add_key(ctx, table, "charset", result, &rlen, 0); + result = _add_key(ctx, table, "username", result, 1); + result = _add_key(ctx, table, "realm", result, 1); + result = _add_key(ctx, table, "nonce", result, 1); + result = _add_key(ctx, table, "cnonce", result, 1); + result = _add_key(ctx, table, "nc", result, 0); + result = _add_key(ctx, table, "qop", result, 0); + result = _add_key(ctx, table, "digest-uri", result, 1); + result = _add_key(ctx, table, "response", result, 0); + result = _add_key(ctx, table, "charset", result, 0); xmpp_free(ctx, node); xmpp_free(ctx, domain);