[nrf fromlist] secure_storage: its: use %l printf length modifier

Cast the UIDs to unsigned long when they are 32 bits.
This allows to use a single %l length modifier instead of the double
one for long long.

Certain printf implementations only support the former and not the
latter length modifier, so this has the advantage to work with them
now that the UIDs are 32-bit by default.

Signed-off-by: Tomi Fontanilles <[email protected]>

Upstream PR #: 94171

(cherry picked from commit 2ce0698)

Author: tomi-font

subsys/secure_storage/src/its/implementation.c

@@ -115,8 +115,15 @@ static bool keep_stored_entry(secure_storage_its_uid_t uid, size_t data_length,
 	if (existing_data_len == data_length &&
 	    existing_create_flags == create_flags &&
 	    !memcmp(existing_data, p_data, data_length)) {
-		LOG_DBG("Not writing entry %u/%llu to storage because its stored data"
-			" (of length %zu) is identical.", uid.caller_id, uid.uid, data_length);
+#ifdef CONFIG_SECURE_STORAGE_64_BIT_UID
+		LOG_DBG("Not writing entry %u/%#llx to storage because its stored data"
+			" (of length %zu) is identical.", uid.caller_id,
+			(unsigned long long)uid.uid, data_length);
+#else
+		LOG_DBG("Not writing entry %u/%#lx to storage because its stored data"
+			" (of length %zu) is identical.", uid.caller_id,
+			(unsigned long)uid.uid, data_length);
+#endif
 		*ret = PSA_SUCCESS;
 		return true;
 	}

subsys/secure_storage/src/its/store/settings.c

@@ -38,9 +38,15 @@ void secure_storage_its_store_settings_get_name(
 {
 	int ret;
 
+#ifdef CONFIG_SECURE_STORAGE_64_BIT_UID
 	ret = snprintf(name, SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE,
 		       CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX "%x/%llx",
 		       uid.caller_id, (unsigned long long)uid.uid);
+#else
+	ret = snprintf(name, SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE,
+		       CONFIG_SECURE_STORAGE_ITS_STORE_SETTINGS_PREFIX "%x/%lx",
+		       uid.caller_id, (unsigned long)uid.uid);
+#endif
 	__ASSERT_NO_MSG(ret > 0 && ret < SECURE_STORAGE_ITS_STORE_SETTINGS_NAME_BUF_SIZE);
 }