Cleanup string print format for iree_device_size_t

It should use PRIdsz instead of hard-coded PRIu64
silvasean · Sep 3, 2021 · 69d831c · 69d831c
1 parent 674aa9a
commit 69d831c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/iree/hal/buffer.c b/iree/hal/buffer.c
@@ -172,7 +172,7 @@ IREE_API_EXPORT iree_status_t iree_hal_buffer_validate_range(
     return iree_make_status(
         IREE_STATUS_OUT_OF_RANGE,
         "attempted to access an address off the end of the valid buffer range "
-        "(offset=%" PRIu64 ", length=%" PRIu64 ", buffer byte_length=%" PRIu64
+        "(offset=%" PRIdsz ", length=%" PRIdsz ", buffer byte_length=%" PRIdsz
         ")",
         byte_offset, byte_length, iree_hal_buffer_byte_length(buffer));
   }
@@ -188,8 +188,8 @@ IREE_API_EXPORT iree_status_t iree_hal_buffer_validate_range(
     return iree_make_status(
         IREE_STATUS_OUT_OF_RANGE,
         "attempted to access an address outside of the valid buffer range "
-        "(offset=%" PRIu64 ", length=%" PRIu64 ", end(inc)=%" PRIu64
-        ", buffer byte_length=%" PRIu64 ")",
+        "(offset=%" PRIdsz ", length=%" PRIdsz ", end(inc)=%" PRIdsz
+        ", buffer byte_length=%" PRIdsz ")",
         byte_offset, byte_length, end - 1, iree_hal_buffer_byte_length(buffer));
   }
 
@@ -208,8 +208,8 @@ static iree_status_t iree_hal_buffer_calculate_range(
     return iree_make_status(
         IREE_STATUS_OUT_OF_RANGE,
         "attempted to access an address off the end of the valid buffer "
-        "range (offset=%" PRIu64 ", length=%" PRIu64
-        ", buffer byte_length=%" PRIu64 ")",
+        "range (offset=%" PRIdsz ", length=%" PRIdsz
+        ", buffer byte_length=%" PRIdsz ")",
         offset, length, max_length);
   }
 
@@ -241,8 +241,8 @@ static iree_status_t iree_hal_buffer_calculate_range(
     return iree_make_status(
         IREE_STATUS_OUT_OF_RANGE,
         "attempted to access an address outside of the valid buffer "
-        "range (offset=%" PRIu64 ", adjusted_length=%" PRIu64 ", end=%" PRIu64
-        ", buffer byte_length=%" PRIu64 ")",
+        "range (offset=%" PRIdsz ", adjusted_length=%" PRIdsz ", end=%" PRIdsz
+        ", buffer byte_length=%" PRIdsz ")",
         offset, adjusted_length, end, max_length);
   }
 
@@ -411,8 +411,8 @@ iree_hal_buffer_fill(iree_hal_buffer_t* buffer, iree_device_size_t byte_offset,
     IREE_TRACE_ZONE_END(z0);
     return iree_make_status(IREE_STATUS_INVALID_ARGUMENT,
                             "attempting to fill a range with %zu byte values "
-                            "that is not aligned (offset=%" PRIu64
-                            ", length=%" PRIu64 ")",
+                            "that is not aligned (offset=%" PRIdsz
+                            ", length=%" PRIdsz ")",
                             pattern_length, byte_offset, byte_length);
   }
 

diff --git a/iree/hal/buffer_view.c b/iree/hal/buffer_view.c
@@ -302,7 +302,7 @@ IREE_API_EXPORT iree_status_t iree_hal_buffer_view_reshape(
   if (new_element_count != old_element_count) {
     return iree_make_status(IREE_STATUS_INVALID_ARGUMENT,
                             "buffer view reshapes must have the same element "
-                            "count; target=%" PRIu64 ", existing=%" PRIu64,
+                            "count; target=%" PRIdsz ", existing=%" PRIdsz,
                             new_element_count, old_element_count);
   }
 

diff --git a/iree/hal/command_buffer_validation.c b/iree/hal/command_buffer_validation.c
@@ -297,7 +297,7 @@ static iree_status_t iree_hal_validating_command_buffer_fill_buffer(
     return iree_make_status(
         IREE_STATUS_INVALID_ARGUMENT,
         "fill offset and/or length do not match the natural alignment of the "
-        "fill value (target_offset=%" PRIu64 ", length=%" PRIu64
+        "fill value (target_offset=%" PRIdsz ", length=%" PRIdsz
         ", pattern_length=%zu)",
         target_offset, length, pattern_length);
   }

diff --git a/iree/modules/hal/module.c b/iree/modules/hal/module.c
@@ -385,7 +385,7 @@ IREE_VM_ABI_EXPORT(iree_hal_module_buffer_store,  //
              iree_hal_buffer_byte_length(target_buffer)) {
     return iree_make_status(
         IREE_STATUS_OUT_OF_RANGE,
-        "store out of bounds (target_offset=%d, length=%d into max %" PRIu64
+        "store out of bounds (target_offset=%d, length=%d into max %" PRIdsz
         ")",
         target_offset, length, iree_hal_buffer_byte_length(target_buffer));
   }