[Asterisk-code-review] tests: Fix compilation errors on 32-bit. (asterisk[19])

[Joshua Colp]

Joshua Colp has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/19502 )

Change subject: tests: Fix compilation errors on 32-bit.
......................................................................

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
---
M res/res_pjsip_outbound_authenticator_digest.c
M tests/test_mwi.c
M tests/test_stasis.c
M tests/test_stasis_state.c
4 files changed, 27 insertions(+), 6 deletions(-)

Approvals:
  George Joseph: Looks good to me, approved
  Joshua Colp: Approved for Submit




diff --git a/res/res_pjsip_outbound_authenticator_digest.c b/res/res_pjsip_outbound_authenticator_digest.c
index 4821082..aee4afc 100644
--- a/res/res_pjsip_outbound_authenticator_digest.c
+++ b/res/res_pjsip_outbound_authenticator_digest.c
@@ -384,9 +384,9 @@
 	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:
diff --git a/tests/test_mwi.c b/tests/test_mwi.c
index 3f633b3..c999963 100644
--- a/tests/test_mwi.c
+++ b/tests/test_mwi.c
@@ -63,6 +63,7 @@
 
 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 @@
 		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;
 }
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 5efb1ec..71026a6 100644
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -2195,7 +2195,7 @@
 	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]);
diff --git a/tests/test_stasis_state.c b/tests/test_stasis_state.c
index 3ad450d..3dc5334 100644
--- a/tests/test_stasis_state.c
+++ b/tests/test_stasis_state.c
@@ -63,11 +63,13 @@
 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 @@
 {
 	struct stasis_message *msg;
 	struct foo_data *foo;
+	uintmax_t tmp;
 
 	foo = ao2_alloc(sizeof(*foo), NULL);
 	if (!foo) {
@@ -254,11 +257,12 @@
 		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) {

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/19502
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 19
Gerrit-Change-Id: I363e6057ef84d54b88af80d23ad6147eef9216ee
Gerrit-Change-Number: 19502
Gerrit-PatchSet: 1
Gerrit-Owner: N A <asterisk at phreaknet.org>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20221028/d9f04292/attachment-0001.html>