changes suggested by -Wextra

This commit is contained in:
F. Duncanh
2025-12-31 17:27:50 -05:00
parent b3f0a14951
commit 3be60fdbda
8 changed files with 10 additions and 14 deletions

View File

@@ -892,7 +892,7 @@ char *adjust_yt_condensed_playlist(const char *media_playlist) {
new_pos += len; new_pos += len;
old_pos += len; old_pos += len;
assert(byte_count == new_len); assert(byte_count == (int) new_len);
free (prefix); free (prefix);
free (base_uri); free (base_uri);

View File

@@ -104,7 +104,7 @@ logger_log(logger_t *logger, int level, const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
int message_len = vsnprintf(buffer, sizeof(buffer), fmt, ap); int message_len = vsnprintf(buffer, sizeof(buffer), fmt, ap);
va_end(ap); va_end(ap);
if (message_len >= sizeof(buffer)) { if (message_len >= (int) sizeof(buffer)) {
snprintf(err_buf, sizeof(err_buf), err_fmt, message_len, (int) sizeof(buffer) -1); snprintf(err_buf, sizeof(err_buf), err_fmt, message_len, (int) sizeof(buffer) -1);
} }
MUTEX_LOCK(logger->cb_mutex); MUTEX_LOCK(logger->cb_mutex);

View File

@@ -198,7 +198,7 @@ pairing_session_get_public_key(pairing_session_t *session, unsigned char ecdh_ke
int int
pairing_session_make_nonce(pairing_session_t *session, uint64_t *local_time, const char *client_data, unsigned char *nonce, int len) { pairing_session_make_nonce(pairing_session_t *session, uint64_t *local_time, const char *client_data, unsigned char *nonce, int len) {
unsigned char hash[SHA512_DIGEST_LENGTH]; unsigned char hash[SHA512_DIGEST_LENGTH];
if (len > sizeof(hash)) { if (len > (int) sizeof(hash)) {
return -1; return -1;
} }
if (!client_data || !local_time || !session || !nonce || len <= 0) { if (!client_data || !local_time || !session || !nonce || len <= 0) {

View File

@@ -211,7 +211,7 @@ raop_buffer_enqueue(raop_buffer_t *raop_buffer, unsigned char *data, unsigned sh
entry->payload_data = malloc(payload_size); entry->payload_data = malloc(payload_size);
int decrypt_ret = raop_buffer_decrypt(raop_buffer, data, entry->payload_data, payload_size, &entry->payload_size); int decrypt_ret = raop_buffer_decrypt(raop_buffer, data, entry->payload_data, payload_size, &entry->payload_size);
assert(decrypt_ret >= 0); assert(decrypt_ret >= 0);
assert(entry->payload_size <= payload_size); assert((int) entry->payload_size <= payload_size);
/* Update the raop_buffer seqnums */ /* Update the raop_buffer seqnums */
if (raop_buffer->is_empty) { if (raop_buffer->is_empty) {

View File

@@ -271,8 +271,6 @@ raop_handler_pairpinstart(raop_conn_t *conn,
raop->callbacks.display_pin(raop->callbacks.cls, pin); raop->callbacks.display_pin(raop->callbacks.cls, pin);
} }
logger_log(raop->logger, LOGGER_INFO, "*** CLIENT MUST NOW ENTER PIN = \"%s\" AS AIRPLAY PASSWORD", pin); logger_log(raop->logger, LOGGER_INFO, "*** CLIENT MUST NOW ENTER PIN = \"%s\" AS AIRPLAY PASSWORD", pin);
*response_data = NULL;
response_datalen = 0;
} }
static void static void
@@ -320,10 +318,8 @@ raop_handler_pairsetup_pin(raop_conn_t *conn,
plist_get_string_val(req_method_node, &method); plist_get_string_val(req_method_node, &method);
if (strncmp(method, "pin", strlen (method))) { if (strncmp(method, "pin", strlen (method))) {
logger_log(raop->logger, LOGGER_ERR, "error, required method is \"pin\", client requested \"%s\"", method); logger_log(raop->logger, LOGGER_ERR, "error, required method is \"pin\", client requested \"%s\"", method);
*response_data = NULL; free (method);
response_datalen = 0; plist_free (req_root_node);
free (method);
plist_free (req_root_node);
return; return;
} }
plist_mem_free(method); plist_mem_free(method);
@@ -908,7 +904,7 @@ raop_handler_setup(raop_conn_t *conn,
conn->raop_rtp_mirror = NULL; conn->raop_rtp_mirror = NULL;
char remote[40] = { 0 }; char remote[40] = { 0 };
int len = utils_ipaddress_to_string(conn->remotelen, conn->remote, conn->zone_id, remote, (int) sizeof(remote)); int len = utils_ipaddress_to_string(conn->remotelen, conn->remote, conn->zone_id, remote, (int) sizeof(remote));
if (!len || len > sizeof(remote)) { if (!len || len > (int) sizeof(remote)) {
char *str = utils_data_to_string(conn->remote, conn->remotelen, 16); char *str = utils_data_to_string(conn->remote, conn->remotelen, 16);
logger_log(raop->logger, LOGGER_ERR, "failed to extract valid client ip address:\n" logger_log(raop->logger, LOGGER_ERR, "failed to extract valid client ip address:\n"
"*** UxPlay will be unable to send communications to client.\n" "*** UxPlay will be unable to send communications to client.\n"

View File

@@ -371,7 +371,7 @@ raop_rtp_mirror_thread(void *arg)
readstart = 0; readstart = 0;
} }
while (readstart < payload_size) { while ((int) readstart < payload_size) {
// Payload data // Payload data
unsigned char *pos = payload + readstart; unsigned char *pos = payload + readstart;
ret = recv(stream_fd, CAST pos, payload_size - readstart, 0); ret = recv(stream_fd, CAST pos, payload_size - readstart, 0);

View File

@@ -526,7 +526,7 @@ static int hash_session_key( SRP_HashAlgorithm alg, const BIGNUM * n, unsigned c
static void calculate_M( SRP_HashAlgorithm alg, NGConstant *ng, unsigned char * dest, const char * I, const BIGNUM * s, static void calculate_M( SRP_HashAlgorithm alg, NGConstant *ng, unsigned char * dest, const char * I, const BIGNUM * s,
const BIGNUM * A, const BIGNUM * B, const unsigned char * K ) const BIGNUM * A, const BIGNUM * B, const unsigned char * K )
{ {
unsigned char H_N[ SHA512_DIGEST_LENGTH ] = {0}; unsigned char H_N[ SHA512_DIGEST_LENGTH ] = {0};
unsigned char H_g[ SHA512_DIGEST_LENGTH ] = {0}; unsigned char H_g[ SHA512_DIGEST_LENGTH ] = {0};
unsigned char H_I[ SHA512_DIGEST_LENGTH ] = {0}; unsigned char H_I[ SHA512_DIGEST_LENGTH ] = {0};
unsigned char H_xor[ SHA512_DIGEST_LENGTH ] = {0}; unsigned char H_xor[ SHA512_DIGEST_LENGTH ] = {0};

View File

@@ -211,7 +211,7 @@ char *utils_data_to_string(const unsigned char *data, int datalen, int chars_per
n--; n--;
p++; p++;
assert(p == &(str[len])); assert(p == &(str[len]));
assert(len == strlen(str)); assert(len == (int) strlen(str));
return str; return str;
} }