kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix compilation errors on 32-bit.

Browse Source 
Fix compilation errors caused by using size_t
instead of uintmax_t and non-portable format
specifiers.

ASTERISK-30273 #close

Change-Id: I363e6057ef84d54b88af80d23ad6147eef9216ee
This commit is contained in:
Naveen Albert
2022-10-23 15:16:31 +00:00
committed by N A
parent a6aebab79b
commit 025dbcfd68
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_pjsip_outbound_authenticator_digest.c
View File

@@ -384,9 +384,9 @@ static pj_status_t set_outbound_authentication_credentials(pjsip_auth_clt_sess *
res = pjsip_auth_clt_set_credentials(auth_sess, cred_count, creds_array); res = pjsip_auth_clt_set_credentials(auth_sess, cred_count, creds_array);
ast_free(creds_array); ast_free(creds_array);
if (res == PJ_SUCCESS) { if (res == PJ_SUCCESS) {
ast_debug(3, "Set %"PRIu64" credentials in auth session\n", cred_count); ast_debug(3, "Set %zu credentials in auth session\n", cred_count);
} else { } else {
ast_log(LOG_ERROR, "Failed to set %"PRIu64" credentials in auth session\n", cred_count); ast_log(LOG_ERROR, "Failed to set %zu credentials in auth session\n", cred_count);
} }
cleanup: cleanup:

4
tests/test_mwi.c
View File

@@ -63,6 +63,7 @@ static int num_to_mailbox(char *mailbox, size_t size, size_t num)
static int mailbox_to_num(const char *mailbox, size_t *num) static int mailbox_to_num(const char *mailbox, size_t *num)
{ {
uintmax_t tmp;
const char *p = strchr(mailbox, '~'); const char *p = strchr(mailbox, '~');
if (!p) { if (!p) {
@@ -70,10 +71,11 @@ static int mailbox_to_num(const char *mailbox, size_t *num)
return -1; return -1;
} }
if (ast_str_to_umax(++p, num)) { if (ast_str_to_umax(++p, &tmp)) {
ast_log(LOG_ERROR, "Unable to convert mailbox '%s' to numeric\n", mailbox); ast_log(LOG_ERROR, "Unable to convert mailbox '%s' to numeric\n", mailbox);
return -1; return -1;
} }
*num = (size_t) tmp;
return 0; return 0;
} }

2
tests/test_stasis.c
View File

@@ -2195,7 +2195,7 @@ static void dump_consumer(struct ast_test *test, struct cts *cts)
int i; int i;
struct stasis_subscription_change *data; struct stasis_subscription_change *data;
ast_test_status_update(test, "Messages received: %ld Final? %s\n", cts->consumer->messages_rxed_len, ast_test_status_update(test, "Messages received: %zu Final? %s\n", cts->consumer->messages_rxed_len,
cts->consumer->complete ? "yes" : "no"); cts->consumer->complete ? "yes" : "no");
for (i = 0; i < cts->consumer->messages_rxed_len; i++) { for (i = 0; i < cts->consumer->messages_rxed_len; i++) {
data = stasis_message_data(cts->consumer->messages_rxed[i]); data = stasis_message_data(cts->consumer->messages_rxed[i]);

8
tests/test_stasis_state.c
View File

@@ -63,11 +63,13 @@ static int expect_null;
static int validate_data(const char *id, struct foo_data *foo) static int validate_data(const char *id, struct foo_data *foo)
{ {
size_t num; size_t num;
uintmax_t tmp;
if (ast_str_to_umax(id, &num)) { if (ast_str_to_umax(id, &tmp)) {
ast_log(LOG_ERROR, "Unable to convert the state's id '%s' to numeric\n", id); ast_log(LOG_ERROR, "Unable to convert the state's id '%s' to numeric\n", id);
return -1; return -1;
} }
num = (size_t) tmp;
running_total += num; running_total += num;
@@ -247,6 +249,7 @@ static struct stasis_message *create_foo_type_message(const char *id)
{ {
struct stasis_message *msg; struct stasis_message *msg;
struct foo_data *foo; struct foo_data *foo;
uintmax_t tmp;
foo = ao2_alloc(sizeof(*foo), NULL); foo = ao2_alloc(sizeof(*foo), NULL);
if (!foo) { if (!foo) {
@@ -254,11 +257,12 @@ static struct stasis_message *create_foo_type_message(const char *id)
return NULL; return NULL;
} }
if (ast_str_to_umax(id, &foo->bar)) { if (ast_str_to_umax(id, &tmp)) {
ast_log(LOG_ERROR, "Unable to convert the state's id '%s' to numeric\n", id); ast_log(LOG_ERROR, "Unable to convert the state's id '%s' to numeric\n", id);
ao2_ref(foo, -1); ao2_ref(foo, -1);
return NULL; return NULL;
} }
foo->bar = (size_t) tmp;
msg = stasis_message_create_full(foo_type(), foo, NULL); msg = stasis_message_create_full(foo_type(), foo, NULL);
if (!msg) { if (!msg) {