From: Daniel Stenberg Date: Wed, 2 Sep 2020 10:46:48 +0000 (+0200) Subject: mqtt.c: avoid curl_ prefix on local variable X-Git-Tag: curl-7_73_0~156 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5507a6ae412e2b28636f4dacc060b74578caa59d;p=thirdparty%2Fcurl.git mqtt.c: avoid curl_ prefix on local variable Closes #5906 --- diff --git a/lib/mqtt.c b/lib/mqtt.c index 486066fb6a..b3b2b8c939 100644 --- a/lib/mqtt.c +++ b/lib/mqtt.c @@ -142,7 +142,7 @@ static CURLcode mqtt_connect(struct connectdata *conn) const size_t client_id_offset = 14; const size_t packetlen = client_id_offset + MQTT_CLIENTID_LEN; char client_id[MQTT_CLIENTID_LEN + 1] = "curl"; - const size_t curl_len = strlen("curl"); + const size_t clen = strlen("curl"); char packet[32] = { MQTT_MSG_CONNECT, /* packet type */ 0x00, /* remaining length */ @@ -156,8 +156,8 @@ static CURLcode mqtt_connect(struct connectdata *conn) packet[1] = (packetlen - 2) & 0x7f; packet[client_id_offset - 1] = MQTT_CLIENTID_LEN; - result = Curl_rand_hex(conn->data, (unsigned char *)&client_id[curl_len], - MQTT_CLIENTID_LEN - curl_len + 1); + result = Curl_rand_hex(conn->data, (unsigned char *)&client_id[clen], + MQTT_CLIENTID_LEN - clen + 1); memcpy(&packet[client_id_offset], client_id, MQTT_CLIENTID_LEN); infof(conn->data, "Using client id '%s'\n", client_id); if(!result)