tests: Fix compilation errors on 32-bit.
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:
parent
7b2d3a6411
commit
26283a4d59
|
@ -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);
|
||||
ast_free(creds_array);
|
||||
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 {
|
||||
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:
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
uintmax_t tmp;
|
||||
const char *p = strchr(mailbox, '~');
|
||||
|
||||
if (!p) {
|
||||
|
@ -70,10 +71,11 @@ static int mailbox_to_num(const char *mailbox, size_t *num)
|
|||
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);
|
||||
return -1;
|
||||
}
|
||||
*num = (size_t) tmp;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -2195,7 +2195,7 @@ static void dump_consumer(struct ast_test *test, struct cts *cts)
|
|||
int i;
|
||||
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");
|
||||
for (i = 0; i < cts->consumer->messages_rxed_len; i++) {
|
||||
data = stasis_message_data(cts->consumer->messages_rxed[i]);
|
||||
|
|
|
@ -63,11 +63,13 @@ static int expect_null;
|
|||
static int validate_data(const char *id, struct foo_data *foo)
|
||||
{
|
||||
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);
|
||||
return -1;
|
||||
}
|
||||
num = (size_t) tmp;
|
||||
|
||||
running_total += num;
|
||||
|
||||
|
@ -247,6 +249,7 @@ static struct stasis_message *create_foo_type_message(const char *id)
|
|||
{
|
||||
struct stasis_message *msg;
|
||||
struct foo_data *foo;
|
||||
uintmax_t tmp;
|
||||
|
||||
foo = ao2_alloc(sizeof(*foo), NULL);
|
||||
if (!foo) {
|
||||
|
@ -254,11 +257,12 @@ static struct stasis_message *create_foo_type_message(const char *id)
|
|||
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);
|
||||
ao2_ref(foo, -1);
|
||||
return NULL;
|
||||
}
|
||||
foo->bar = (size_t) tmp;
|
||||
|
||||
msg = stasis_message_create_full(foo_type(), foo, NULL);
|
||||
if (!msg) {
|
||||
|
|
Loading…
Reference in New Issue