replace ARR_COUNT with countof

see also recent commit 951f964

countof seem to be upcoming C2Y language macro (and _Countof operator)
so make use of it instead of ARR_COUNT that is now removed.

Author: MartinPulec

src/audio/capture/fluidsynth.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2025 CESNET
+ * Copyright (c) 2025-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,7 +56,7 @@
 #include "types.h"                // for device_info
 #include "utils/color_out.h"      // for color_printf, TBOLD, TRED
 #include "utils/fs.h"             // for get_install_root, get_temp_file
-#include "utils/macros.h"         // for ARR_COUNT, IS_KEY_PREFIX
+#include "utils/macros.h"         // for IS_KEY_PREFIX, countof
 
 struct module;
 
@@ -196,13 +196,13 @@ get_soundfont()
 
         const char *force_bundled_sf = getenv("ULTRAGRID_BUNDLED_SF");
         if (force_bundled_sf != NULL && strcmp(force_bundled_sf, "1") == 0) {
-                for (size_t i = ARR_COUNT(sf_candidates) - 1; i > 0; --i) {
+                for (size_t i = countof(sf_candidates) - 1; i > 0; --i) {
                         sf_candidates[i] = sf_candidates[i - 1];
                 }
                 sf_candidates[0] = bundled;
         }
 
-        for (size_t i = 0; i < ARR_COUNT(sf_candidates); ++i) {
+        for (size_t i = 0; i < countof(sf_candidates); ++i) {
                 const char *path = sf_candidates[i];
                 FILE *f = fopen(path, "rb");
                 debug_msg(MOD_NAME

src/blackmagic_common.cpp

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2014-2025 CESNET, zájmové sdružení právnických osob
+ * Copyright (c) 2014-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
 #include "tv.h"
 #include "utils/color_out.h"
 #include "utils/debug.h"         // for DEBUG_TIMER_*
-#include "utils/macros.h"
+#include "utils/macros.h"        // for countof
 #include "utils/string.h"        // for DELDEL
 #include "utils/windows.h"
 #include "utils/worker.h"
@@ -786,12 +786,12 @@ static const struct {
 #undef BMDFCC
 
 static string fcc_to_string(uint32_t fourcc) {
-        for (unsigned i = 0; i < ARR_COUNT(opt_name_map); ++i) {
+        for (unsigned i = 0; i < countof(opt_name_map); ++i) {
                 if (opt_name_map[i].fourcc == fourcc) {
                         return opt_name_map[i].name;
                 }
         }
-        for (unsigned i = 0; i < ARR_COUNT(val_name_map); ++i) {
+        for (unsigned i = 0; i < countof(val_name_map); ++i) {
                 if (val_name_map[i].fourcc == fourcc) {
                         return val_name_map[i].name;
                 }
@@ -936,7 +936,7 @@ bmd_opt_help()
         color_printf("\n");
 
         color_printf("List of keys:\n");
-        for (unsigned i = 0; i < ARR_COUNT(opt_name_map); ++i) {
+        for (unsigned i = 0; i < countof(opt_name_map); ++i) {
                 if (opt_name_map[i].fourcc == 0) {
                         color_printf("\n%s:\n", opt_name_map[0].name);
                 } else {
@@ -952,7 +952,7 @@ bmd_opt_help()
         color_printf("\n");
         color_printf("Incomplete " TBOLD("(!)") " list of values:\n");
         color_printf("(note that the value belongs to its appropriate key)\n");
-        for (unsigned i = 0; i < ARR_COUNT(val_name_map); ++i) {
+        for (unsigned i = 0; i < countof(val_name_map); ++i) {
                 uint32_t val = htonl(val_name_map[i].fourcc);
                 color_printf("- " TBOLD("%.4s") " - %s\n", (char *) &val,
                              val_name_map[i].name);
@@ -1589,7 +1589,7 @@ print_status_item(IDeckLinkStatus *deckLinkStatus, BMDDeckLinkStatusID prop,
 {
         const struct status_property *s_prop = nullptr;
 
-        for (unsigned i = 0; i < ARR_COUNT(status_map); ++i) {
+        for (unsigned i = 0; i < countof(status_map); ++i) {
                 if (status_map[i].prop == prop) {
                         s_prop = &status_map[i];
                         break;
@@ -1835,7 +1835,7 @@ bmd_print_status_subscribe_notify(IDeckLink *deckLink, const char *log_prefix,
                   "Cannot obtain IID_IDeckLinkStatus from DeckLink",
                   return nullptr);
         // print status_map values now
-        for (unsigned u = 0; u < ARR_COUNT(status_map); ++u) {
+        for (unsigned u = 0; u < countof(status_map); ++u) {
                 if (capture && status_map[u].playback_only) {
                         continue;
                 }

src/libavcodec/from_lavc_vid_conv.c

@@ -4,7 +4,7 @@
  * @author Martin Piatka    <445597@mail.muni.cz>
  */
 /*
- * Copyright (c) 2013-2025 CESNET
+ * Copyright (c) 2013-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,7 +72,7 @@
 #include "pixfmt_conv.h"
 #include "types.h"
 #include "utils/debug.h"  // for DEBUG_TIMER_*
-#include "utils/macros.h" // OPTIMIZED_FOR
+#include "utils/macros.h" // for OPTIMIZED_FOR, countof
 #include "utils/misc.h"   // get_cpu_core_count
 #include "utils/worker.h" // task_run_parallel
 #include "video.h"
@@ -3174,7 +3174,7 @@ int
 from_lavc_pf_priority(struct pixfmt_desc internal, codec_t ugc)
 {
         bool found_a_conversion = false;
-        for (unsigned i = 0; i < ARR_COUNT(av_to_uv_conversions); i++) {
+        for (unsigned i = 0; i < countof(av_to_uv_conversions); i++) {
                 if (av_to_uv_conversions[i].uv_codec == ugc) {
                         found_a_conversion = true;
                         break;
@@ -3186,7 +3186,7 @@ from_lavc_pf_priority(struct pixfmt_desc internal, codec_t ugc)
         if (internal.depth == 0) { // unspecified internal format
                 return VDEC_PRIO_LOW;
         }
-        for (unsigned i = 0; i < ARR_COUNT(av_to_uv_conversions); i++) {
+        for (unsigned i = 0; i < countof(av_to_uv_conversions); i++) {
                 if (av_to_uv_conversions[i].uv_codec != ugc) {
                         continue;
                 }

src/module.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2013-2025 CESNET
+ * Copyright (c) 2013-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "debug.h"
 #include "messaging.h"      // for check_message, free_message, ...
 #include "utils/list.h"
-#include "utils/macros.h"          // for ARR_COUNT, to_fourcc
+#include "utils/macros.h"   // for countof, to_fourcc
 
 #define MOD_NAME "[module] "
 #define MODULE_MAGIC to_fourcc('M', 'O', 'D', ' ')
@@ -212,7 +212,7 @@ static const char *const module_class_name_pairs[] = {
 
 const char *module_class_name(enum module_class cls)
 {
-        if ((unsigned int) cls >= ARR_COUNT(module_class_name_pairs)) {
+        if ((unsigned int) cls >= countof(module_class_name_pairs)) {
                 MSG(ERROR, "No name for module class %d!\n", (int) cls);
                 return NULL;
         }

src/utils/macros.h

@@ -64,7 +64,6 @@
 #ifndef countof // defined in C2Y stdcountof.h
 #define countof(arr) (sizeof (arr) / sizeof (arr)[0])
 #endif
-#define ARR_COUNT(arr) countof(arr)
 
 #undef MIN
 #define MIN(a,b) (((a)<(b))?(a):(b))

src/utils/opencl.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <martin.pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2025 CESNET
+ * Copyright (c) 2025-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ ADD_TO_PARAM(PARAM_NAME, PARAM_HELP);
 
 #include "compat/strings.h"    // for strcasecmp
 #include "debug.h"             // for MSG
-#include "utils/macros.h"      // for ARR_COUNT, SHORT_STR
+#include "utils/macros.h"      // for SHORT_STR, countof
 #include "utils/color_out.h"   // for TBOLD
 
 #define CHECK_OPENCL(cmd, errmsg, erraction) \
@@ -93,7 +93,7 @@ print_device_details(cl_device_id device)
         if (clGetDeviceInfo(device, CL_DEVICE_TYPE, sizeof device_type,
                             &device_type, NULL) == CL_SUCCESS) {
                 const char *type = "UNKNOWN";
-                for (unsigned i = 0; i < ARR_COUNT(dev_type_map); ++i) {
+                for (unsigned i = 0; i < countof(dev_type_map); ++i) {
                         if (dev_type_map[i].cl_type == device_type) {
                                 type = dev_type_map[i].name;
                         }
@@ -265,7 +265,7 @@ opencl_get_device(void **platform_id, void **device_id)
                                                     CL_DEVICE_TYPE_GPU,
                                                     CL_DEVICE_TYPE_CPU,
                                                     CL_DEVICE_TYPE_ALL };
-                for (unsigned i = 0; i < ARR_COUNT(try_type); i++) {
+                for (unsigned i = 0; i < countof(try_type); i++) {
                         if (get_device(try_type[i], 0, 0, platform_id,
                                        device_id)) {
                                 return true;
@@ -284,7 +284,7 @@ opencl_get_device(void **platform_id, void **device_id)
                         req_device_idx = atoi(strchr(req_device, '-') + 1);
                 }
         } else {
-                for (unsigned i = 0; i < ARR_COUNT(dev_type_map); ++i) {
+                for (unsigned i = 0; i < countof(dev_type_map); ++i) {
                         if (strcasecmp(dev_type_map[i].name, req_device) == 0) {
                                 req_type = dev_type_map[i].cl_type;
                         }

src/utils/video_pattern_generator.cpp

@@ -13,7 +13,7 @@
  */
 /*
  * Copyright (c) 2005-2006 University of Glasgow
- * Copyright (c) 2005-2025 CESNET, zájmové sdružení právnických osob
+ * Copyright (c) 2005-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@
 #include "ug_runtime_error.hpp"
 #include "utils/bitmap_font.h"         // for FONT_H
 #include "utils/color_out.h"
-#include "utils/macros.h"
+#include "utils/macros.h"              // for countof
 #include "utils/string_view_utils.hpp"
 #include "utils/text.h"
 #include "video.h"
@@ -129,7 +129,7 @@ get_color_by_name(const char *col)
                 color_printf("Leading zeros can be omitted, eg. "
                              "`0xFF` produces a red pattern.\n");
                 color_printf("\nfollowing symbolic names can be also used:\n");
-                for (unsigned i = 0; i < ARR_COUNT(colors); ++i) {
+                for (unsigned i = 0; i < countof(colors); ++i) {
                         color_printf("\t- " TBOLD("%s") "\n", colors[i].name);
                 }
                 color_printf("\n");
@@ -141,7 +141,7 @@ get_color_by_name(const char *col)
         if (errno == 0 && endptr[0] == '\0') {
                 return (uint32_t) val;
         }
-        for (unsigned i = 0; i < ARR_COUNT(colors); ++i) {
+        for (unsigned i = 0; i < countof(colors); ++i) {
                 if (strcasecmp(col, colors[i].name) == 0) {
                         return 0xFFU << 24 | colors[i].val;
                 }
@@ -555,7 +555,7 @@ struct image_pattern_strips : public image_pattern
                                                     : type == ROWS ? i
                                                                    : j;
                                 *ptr++ = pattern[(col_idx / fill_w) %
-                                                     ARR_COUNT(pattern)];
+                                                     countof(pattern)];
                         }
                 }
                 return generator_depth::bits8;

src/video_compress/cmpto_j2k.cpp

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2013-2025 CESNET
+ * Copyright (c) 2013-2026 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -74,7 +74,7 @@
 #include "lib_common.h"
 #include "tv.h"
 #include "utils/color_out.h"
-#include "utils/macros.h"            // for IS_KEY_PREFIX, TOSTRING
+#include "utils/macros.h"            // for IS_KEY_PREFIX, TOSTRING, countof
 #include "utils/misc.h"
 #include "utils/opencl.h"
 #include "utils/parallel_conv.h"
@@ -239,7 +239,7 @@ const static struct cmpto_j2k_technology *const technologies[] = {
  */
 static const struct cmpto_j2k_technology *
 get_technology_by_name(const char *name) {
-        for (size_t i = 0; i < ARR_COUNT(technologies); ++i) {
+        for (size_t i = 0; i < countof(technologies); ++i) {
                 if (strcasecmp(name, technologies[i]->name) == 0) {
                         return technologies[i];
                 }
@@ -684,14 +684,14 @@ print_cmpto_j2k_technologies(bool full)
                 MSG(ERROR, "Cannot get list of technologies!\n");
                 return;
         }
-        for (size_t i = 0; i < ARR_COUNT(technologies); ++i) {
+        for (size_t i = 0; i < countof(technologies); ++i) {
                 if ((version->technology & technologies[i]->cmpto_supp_bit) !=
                     0) {
                         color_printf("\t" TBOLD("- %s") "\n", technologies[i]->name);
                 }
         }
 
-        for (size_t i = 0; i < ARR_COUNT(technologies); ++i) {
+        for (size_t i = 0; i < countof(technologies); ++i) {
                 if ((version->technology & technologies[i]->cmpto_supp_bit) !=
                     0) {
                         printf("\n");

src/video_decompress/libavcodec.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <pulec@cesnet.cz>
  */
 /*
- * Copyright (c) 2013-2025 CESNET
+ * Copyright (c) 2013-2026 CESNET, zájmové sdružení právických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@
 #include "rtp/rtpenc_h264.h"
 #include "tv.h"
 #include "utils/debug.h"          // for debug_file_dump
-#include "utils/macros.h"
+#include "utils/macros.h"         // for countof
 #include "video.h"
 #include "video_codec.h"
 #include "video_decompress.h"
@@ -265,7 +265,7 @@ get_decoders(
     const AVCodec    *usable_decoders[static DEC_LEN])
 {
         const char *const *preferred_decoders = (const char *[]){ NULL };
-        for (unsigned int i = 0; i < ARR_COUNT(decoders); ++i) {
+        for (unsigned int i = 0; i < countof(decoders); ++i) {
                 if (decoders[i].avcodec_id == avcodec_id) {
                         preferred_decoders = decoders[i].preferred_decoders;
                         break;

src/video_display/gl.cpp

@@ -80,7 +80,7 @@
 #include "types.h"
 #include "utils/color_out.h"
 #include "utils/debug.h"         // for DEBUG_TIMER_*
-#include "utils/macros.h" // OPTIMIZED_FOR
+#include "utils/macros.h"        // for OPTIMIZED_FOR, countof
 #include "utils/ref_count.hpp"
 #include "video.h"
 #include "video_display.h"
@@ -549,7 +549,7 @@ static void
 gl_print_platforms()
 {
         printf("available platforms:\n");
-        for (unsigned i = 0; i < ARR_COUNT(platform_map); ++i) {
+        for (unsigned i = 0; i < countof(platform_map); ++i) {
                 if (glfwPlatformSupported(platform_map[i].platform_id)) {
                         color_printf("\t- " TBOLD("%s") "\n", platform_map[i].name);
                 }
@@ -562,7 +562,7 @@ gl_print_current_platform()
 {
         const int platform = glfwGetPlatform();
         const char *name = "UNKNOWN/ERROR";
-        for (unsigned i = 0; i < ARR_COUNT(platform_map); ++i) {
+        for (unsigned i = 0; i < countof(platform_map); ++i) {
                 if (platform_map[i].platform_id == platform) {
                         name = platform_map[i].name;
                         break;
@@ -769,7 +769,7 @@ static bool
 set_platform(struct state_gl *s, const char *platform)
 {
 #ifdef GLFW_PLATFORM
-        for (unsigned i = 0; i < ARR_COUNT(platform_map); ++i) {
+        for (unsigned i = 0; i < countof(platform_map); ++i) {
                 if (strcasecmp(platform_map[i].name, platform) == 0) {
                         s->init_hints[GLFW_PLATFORM] = platform_map[i].platform_id;
                         return true;