kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-03 17:30:37 +00:00
Code Issues Projects Releases Wiki Activity

[Core, mod_mariadb, mod_ilbc] Fix build on gcc 12.

Browse Source
This commit is contained in:
Andrey Volk 2023-07-25 00:25:53 +03:00
parent 0cdf1a5757
commit 64f8ff03be
4 changed files with 5 additions and 5 deletions
src
mod
codecs/mod_ilbc
mod_ilbc.c
databases/mod_mariadb
mod_mariadb.c
switch_core_media.cswitch_utils.c

2
src/mod/codecs/mod_ilbc/mod_ilbc.c

@ -48,7 +48,7 @@ static switch_status_t switch_ilbc_fmtp_parse(const char *fmtp, switch_codec_fmt
memset(codec_fmtp, '\0', sizeof(struct switch_codec_fmtp)); memset(codec_fmtp, '\0', sizeof(struct switch_codec_fmtp));
if (fmtp && (mode = strstr(fmtp, "mode=")) && (mode + 5)) { if (fmtp && (mode = strstr(fmtp, "mode=")) && *(mode + 5)) {
codec_ms = atoi(mode + 5); codec_ms = atoi(mode + 5);
} }
if (!codec_ms) { if (!codec_ms) {

2
src/mod/databases/mod_mariadb/mod_mariadb.c

@ -411,7 +411,7 @@ switch_status_t mariadb_finish_results_real(const char* file, const char* func,
if ((status = mysql_next_result(&handle->con))) { if ((status = mysql_next_result(&handle->con))) {
if (status > 0) { if (status > 0) {
err_str = mariadb_handle_get_error(handle); err_str = mariadb_handle_get_error(handle);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "An error occurred trying to get next for query (%s): %s\n", handle->sql, err_str); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "An error occurred trying to get next for query (%s): %s\n", handle->sql, switch_str_nil(err_str));
switch_safe_free(err_str); switch_safe_free(err_str);
break; break;

2
src/switch_core_media.c

@ -1170,7 +1170,7 @@ static uint32_t parse_lifetime_mki(const char **p, const char *end)
val += ((**p) - '0') * i; val += ((**p) - '0') * i;
} }
res |= (val & 0x000000ff); /* MKI_SIZE */ res |= (val & 0x000000ff); /* MKI_SIZE */
} else if (isdigit(*(field_begin + 1)) && (field_begin + 2) && (*(field_begin + 2) == '^') && (field_begin + 3) && isdigit(*(field_begin + 3))) { } else if (isdigit(*(field_begin + 1)) && (*(field_begin + 2) == '^') && isdigit(*(field_begin + 3))) {
res |= (CRYPTO_KEY_MATERIAL_LIFETIME << 24); res |= (CRYPTO_KEY_MATERIAL_LIFETIME << 24);
val = ((uint32_t) (*(field_begin + 1) - '0')) << 8; val = ((uint32_t) (*(field_begin + 1) - '0')) << 8;
res |= val; /* LIFETIME base. */ res |= val; /* LIFETIME base. */

4
src/switch_utils.c

@ -2380,7 +2380,7 @@ SWITCH_DECLARE(int) switch_cmp_addr(switch_sockaddr_t *sa1, switch_sockaddr_t *s
return (s1->sin_addr.s_addr == s2->sin_addr.s_addr && s1->sin_port == s2->sin_port); return (s1->sin_addr.s_addr == s2->sin_addr.s_addr && s1->sin_port == s2->sin_port);
} }
case AF_INET6: case AF_INET6:
if (s16->sin6_addr.s6_addr && s26->sin6_addr.s6_addr) { {
int i; int i;
if (!ip_only) { if (!ip_only) {
@ -2434,7 +2434,7 @@ SWITCH_DECLARE(int) switch_cp_addr(switch_sockaddr_t *sa1, switch_sockaddr_t *sa
return 1; return 1;
case AF_INET6: case AF_INET6:
if (s16->sin6_addr.s6_addr && s26->sin6_addr.s6_addr) { {
int i; int i;
s16->sin6_port = s26->sin6_port; s16->sin6_port = s26->sin6_port;