Mesa (master): pan/decode: Prefer sizeof to ARRAY_SIZE for char

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Feb 3 14:18:29 UTC 2021


Module: Mesa
Branch: master
Commit: 5a975fc8e70eaa0f0e24b187b1b0042204d1f569
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5a975fc8e70eaa0f0e24b187b1b0042204d1f569

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Mon Jan 18 14:13:32 2021 -0500

pan/decode: Prefer sizeof to ARRAY_SIZE for char

One less macro.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8829>

---

 src/panfrost/lib/decode_common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/panfrost/lib/decode_common.c b/src/panfrost/lib/decode_common.c
index 72fba5a7ff3..cd4be5b7027 100644
--- a/src/panfrost/lib/decode_common.c
+++ b/src/panfrost/lib/decode_common.c
@@ -78,10 +78,10 @@ pandecode_add_name(struct pandecode_mapped_memory *mem, uint64_t gpu_va, const c
         if (!name) {
                 /* If we don't have a name, assign one */
 
-                snprintf(mem->name, ARRAY_SIZE(mem->name) - 1,
+                snprintf(mem->name, sizeof(mem->name) - 1,
                          "memory_%" PRIx64, gpu_va);
         } else {
-                assert((strlen(name) + 1) < ARRAY_SIZE(mem->name));
+                assert((strlen(name) + 1) < sizeof(mem->name));
                 memcpy(mem->name, name, strlen(name) + 1);
         }
 }



More information about the mesa-commit mailing list