Fix build warnings

Author: ralight

lib/socks_mosq.c

@@ -62,6 +62,7 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #define SOCKS_REPLY_ADDRESS_TYPE_NOT_SUPPORTED 0x08U
 
 
+#ifdef WITH_SOCKS
 static inline int socks5__network_error(struct mosquitto *mosq)
 {
 	WINDOWS_SET_ERRNO_RW();
@@ -79,8 +80,10 @@ static inline int socks5__network_error(struct mosquitto *mosq)
 		}
 	}
 }
+#endif
 
 
+#ifdef WITH_SOCKS
 static inline int socks5__connection_error(struct mosquitto *mosq)
 {
 	uint8_t v = mosq->in_packet.payload[1];
@@ -105,6 +108,7 @@ static inline int socks5__connection_error(struct mosquitto *mosq)
 	}
 	return MOSQ_ERR_PROXY;
 }
+#endif
 
 
 int mosquitto_socks5_set(struct mosquitto *mosq, const char *host, int port, const char *username, const char *password)

libcommon/password_common.c

@@ -73,25 +73,12 @@ struct mosquitto_pw {
 };
 
 
-static int pw__memcmp_const(const void *a, const void *b, size_t len)
-{
 #ifdef WITH_TLS
+static inline int pw__memcmp_const(const void *a, const void *b, size_t len)
+{
 	return CRYPTO_memcmp(a, b, len);
-#else
-	int rc = 0;
-	const volatile char *ac = a;
-	const volatile char *bc = b;
-
-	if(!a || !b){
-		return 1;
-	}
-
-	for(size_t i=0; i<len; i++){
-		rc |= ((char *)ac)[i] ^ ((char *)bc)[i];
-	}
-	return rc;
-#endif
 }
+#endif
 
 
 /* ==================================================
@@ -221,6 +208,8 @@ static int pw__create_sha512_pbkdf2(struct mosquitto_pw *pw, const char *passwor
 	pw->valid = (rc == MOSQ_ERR_SUCCESS);
 	return rc;
 #else
+	UNUSED(pw);
+	UNUSED(password);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -246,6 +235,8 @@ static int pw__verify_sha512_pbkdf2(struct mosquitto_pw *pw, const char *passwor
 		return MOSQ_ERR_AUTH;
 	}
 #else
+	UNUSED(pw);
+	UNUSED(password);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -282,6 +273,7 @@ static int pw__encode_sha512_pbkdf2(struct mosquitto_pw *pw)
 
 	return MOSQ_ERR_SUCCESS;
 #else
+	UNUSED(pw);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -348,6 +340,8 @@ static int pw__decode_sha512_pbkdf2(struct mosquitto_pw *pw, const char *salt_pa
 	pw->valid = true;
 	return MOSQ_ERR_SUCCESS;
 #else
+	UNUSED(pw);
+	UNUSED(salt_password);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -408,6 +402,8 @@ static int pw__create_sha512(struct mosquitto_pw *pw, const char *password)
 	pw->valid = (rc == MOSQ_ERR_SUCCESS);
 	return rc;
 #else
+	UNUSED(pw);
+	UNUSED(password);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -430,6 +426,8 @@ static int pw__verify_sha512(struct mosquitto_pw *pw, const char *password)
 		return MOSQ_ERR_AUTH;
 	}
 #else
+	UNUSED(pw);
+	UNUSED(password);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -465,6 +463,7 @@ static int pw__encode_sha512(struct mosquitto_pw *pw)
 
 	return MOSQ_ERR_SUCCESS;
 #else
+	UNUSED(pw);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }
@@ -519,6 +518,8 @@ static int pw__decode_sha512(struct mosquitto_pw *pw, const char *salt_password)
 	pw->valid = true;
 	return MOSQ_ERR_SUCCESS;
 #else
+	UNUSED(pw);
+	UNUSED(salt_password);
 	return MOSQ_ERR_NOT_SUPPORTED;
 #endif
 }

src/handle_connect.c

@@ -463,13 +463,15 @@ inline static int send__connack_error_and_return(struct mosquitto *context, uint
 }
 
 
+#ifdef WITH_TLS
 inline static int send__connack_bad_username_or_password_error(struct mosquitto *context, int rc)
 {
 	uint8_t err_code  = context->protocol == mosq_p_mqtt5
 									? (uint8_t)MQTT_RC_BAD_USERNAME_OR_PASSWORD
 									: (uint8_t)CONNACK_REFUSED_BAD_USERNAME_PASSWORD;
 	return send__connack_error_and_return(context, err_code, rc);
 }
+#endif
 
 
 static int read_protocol_name(struct mosquitto *context, char protocol_name[7])
@@ -973,9 +975,9 @@ static int set_username_from_cert_subject_name(struct mosquitto *context)
 
 static int handle_username_from_cert_options(struct mosquitto *context, char **username, char **password, uint16_t password_len)
 {
+#ifdef WITH_TLS
 	int rc;
 
-#ifdef WITH_TLS
 	if(context->listener->ssl_ctx && (context->listener->use_identity_as_username || context->listener->use_subject_as_username)){
 		/* Don't need the username or password if provided */
 		mosquitto_FREE(*username);

src/mux_epoll.c

@@ -161,10 +161,10 @@ int mux_epoll__handle(void)
 	int event_count;
 
 	memset(&ev, 0, sizeof(struct epoll_event));
-#if defined(WITH_WEBSOCKETS)
+#if defined(WITH_WEBSOCKETS) && WITH_WEBSOCKETS == WS_IS_LWS
 	event_count = epoll_wait(db.epollfd, ep_events, MAX_EVENTS, 100);
 #else
-	event_count = epoll_wait(db.epollfd, ep_events, MAX_EVENTS, db.next_event_ms);
+	event_count = epoll_wait(db.epollfd, ep_events, MAX_EVENTS, (int)db.next_event_ms);
 #endif
 
 	db.now_s = mosquitto_time();