*: use array_size instead of raw division

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index c1321dd7dc106d84ec18e45a31d721ba7511cf0e..44cbeabd699003f2752b178521ab8258a7808c50 100644 (file)
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -900,11 +900,10 @@ static int bgpTrapEstablished(struct peer *peer)
 
        oid_copy_addr(index, &addr, IN_ADDR_SIZE);
 
-       smux_trap(bgp_variables, sizeof bgp_variables / sizeof(struct variable),
-                 bgp_trap_oid, sizeof bgp_trap_oid / sizeof(oid), bgp_oid,
+       smux_trap(bgp_variables, array_size(bgp_variables), bgp_trap_oid,
+                 array_size(bgp_trap_oid), bgp_oid,
                  sizeof bgp_oid / sizeof(oid), index, IN_ADDR_SIZE,
-                 bgpTrapList, sizeof bgpTrapList / sizeof(struct trap_object),
-                 BGPESTABLISHED);
+                 bgpTrapList, array_size(bgpTrapList), BGPESTABLISHED);
        return 0;
 }
 
@@ -920,11 +919,10 @@ static int bgpTrapBackwardTransition(struct peer *peer)
 
        oid_copy_addr(index, &addr, IN_ADDR_SIZE);
 
-       smux_trap(bgp_variables, sizeof bgp_variables / sizeof(struct variable),
-                 bgp_trap_oid, sizeof bgp_trap_oid / sizeof(oid), bgp_oid,
+       smux_trap(bgp_variables, array_size(bgp_variables), bgp_trap_oid,
+                 array_size(bgp_trap_oid), bgp_oid,
                  sizeof bgp_oid / sizeof(oid), index, IN_ADDR_SIZE,
-                 bgpTrapList, sizeof bgpTrapList / sizeof(struct trap_object),
-                 BGPBACKWARDTRANSITION);
+                 bgpTrapList, array_size(bgpTrapList), BGPBACKWARDTRANSITION);
        return 0;
 }
 

diff --git a/bgpd/rfapi/vnc_debug.c b/bgpd/rfapi/vnc_debug.c
index 2b08ea493cfcc94c1331bcd7fae29ee3209ab28d..cb9799870b5ed3ff80923f69e6998698f80ba89c 100644 (file)
--- a/bgpd/rfapi/vnc_debug.c
+++ b/bgpd/rfapi/vnc_debug.c
@@ -190,7 +190,7 @@ static int bgp_vnc_config_write_debug(struct vty *vty)
        int write = 0;
        size_t i;
 
-       for (i = 0; i < (sizeof(vncdebug) / sizeof(struct vnc_debug)); ++i) {
+       for (i = 0; i < array_size(vncdebug); ++i) {
                if (conf_vnc_debug & vncdebug[i].bit) {
                        vty_out(vty, "debug bgp vnc %s\n", vncdebug[i].name);
                        write++;

diff --git a/isisd/isis_dlpi.c b/isisd/isis_dlpi.c
index 54a19ad23991138096685f6749ff06114a113679..148b4386616e62979ade3146492a252d7d67a3e4 100644 (file)
--- a/isisd/isis_dlpi.c
+++ b/isisd/isis_dlpi.c
@@ -444,7 +444,7 @@ static int open_dlpi_dev(struct isis_circuit *circuit)
                struct strioctl sioc;
 
                pfil.Pf_Priority = 0;
-               pfil.Pf_FilterLen = sizeof(pf_filter) / sizeof(unsigned short);
+               pfil.Pf_FilterLen = array_size(pf_filter);
                memcpy(pfil.Pf_Filter, pf_filter, sizeof(pf_filter));
                /* pfmod does not support transparent ioctls */
                sioc.ic_cmd = PFIOCSETF;

diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 9126e40d4233a0fd0d1dbbe47975cbc929812ecd..e74a9baadd2a45cb41adfaa83f145870fd62dfcd 100644 (file)
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -80,7 +80,7 @@ struct zebra_privs_t isisd_privs = {
        .vty_group = VTY_GROUP,
 #endif
        .caps_p = _caps_p,
-       .cap_num_p = sizeof(_caps_p) / sizeof(*_caps_p),
+       .cap_num_p = array_size(_caps_p),
        .cap_num_i = 0};
 
 /* isisd options */

diff --git a/lib/imsg.c b/lib/imsg.c
index 935d13772752a2a668fc4d9699793c4addd7845a..57e70617d27849497d45d566112fcbf43ae884ae 100644 (file)
--- a/lib/imsg.c
+++ b/lib/imsg.c
@@ -18,6 +18,7 @@
 
 #include <zebra.h>
 
+#include "memory.h"
 #include "queue.h"
 #include "imsg.h"
 
@@ -35,7 +36,7 @@ static int available_fds(unsigned int n)
        unsigned int i;
        int ret, fds[256];
 
-       if (n > (sizeof(fds) / sizeof(fds[0])))
+       if (n > (unsigned int)array_size(fds))
                return (1);
 
        ret = 0;

diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 376950e84a25f46b8cf8992b56325adbd59a4c43..fc7c6177d7f6cc2e660959390583ced4109a6e4c 100644 (file)
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -1358,13 +1358,10 @@ static int ospf6TrapNbrStateChange(struct ospf6_neighbor *on, int next_state,
        index[1] = on->ospf6_if->instance_id;
        index[2] = ntohl(on->router_id);
 
-       smux_trap(ospfv3_variables,
-                 sizeof ospfv3_variables / sizeof(struct variable),
-                 ospfv3_trap_oid, sizeof ospfv3_trap_oid / sizeof(oid),
-                 ospfv3_oid, sizeof ospfv3_oid / sizeof(oid), index, 3,
-                 ospf6NbrTrapList,
-                 sizeof ospf6NbrTrapList / sizeof(struct trap_object),
-                 NBRSTATECHANGE);
+       smux_trap(ospfv3_variables, array_size(ospfv3_variables),
+                 ospfv3_trap_oid, array_size(ospfv3_trap_oid), ospfv3_oid,
+                 sizeof ospfv3_oid / sizeof(oid), index, 3, ospf6NbrTrapList,
+                 array_size(ospf6NbrTrapList), NBRSTATECHANGE);
        return 0;
 }
 
@@ -1383,13 +1380,10 @@ static int ospf6TrapIfStateChange(struct ospf6_interface *oi, int next_state,
        index[0] = oi->interface->ifindex;
        index[1] = oi->instance_id;
 
-       smux_trap(ospfv3_variables,
-                 sizeof ospfv3_variables / sizeof(struct variable),
-                 ospfv3_trap_oid, sizeof ospfv3_trap_oid / sizeof(oid),
-                 ospfv3_oid, sizeof ospfv3_oid / sizeof(oid), index, 2,
-                 ospf6IfTrapList,
-                 sizeof ospf6IfTrapList / sizeof(struct trap_object),
-                 IFSTATECHANGE);
+       smux_trap(ospfv3_variables, array_size(ospfv3_variables),
+                 ospfv3_trap_oid, array_size(ospfv3_trap_oid), ospfv3_oid,
+                 sizeof ospfv3_oid / sizeof(oid), index, 2, ospf6IfTrapList,
+                 array_size(ospf6IfTrapList), IFSTATECHANGE);
        return 0;
 }
 

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 755634a2f166c5d2d9935351a016a71a7b1b3cc1..f068efc8dbf0c6d005016df97960c935a0335490 100644 (file)
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -2590,13 +2590,10 @@ static void ospfTrapNbrStateChange(struct ospf_neighbor *on)
        oid_copy_addr(index, &(on->address.u.prefix4), IN_ADDR_SIZE);
        index[IN_ADDR_SIZE] = 0;
 
-       smux_trap(ospf_variables,
-                 sizeof ospf_variables / sizeof(struct variable),
-                 ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid,
+       smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid,
+                 array_size(ospf_trap_oid), ospf_oid,
                  sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1,
-                 ospfNbrTrapList,
-                 sizeof ospfNbrTrapList / sizeof(struct trap_object),
-                 NBRSTATECHANGE);
+                 ospfNbrTrapList, array_size(ospfNbrTrapList), NBRSTATECHANGE);
 }
 
 static void ospfTrapVirtNbrStateChange(struct ospf_neighbor *on)
@@ -2608,12 +2605,10 @@ static void ospfTrapVirtNbrStateChange(struct ospf_neighbor *on)
        oid_copy_addr(index, &(on->address.u.prefix4), IN_ADDR_SIZE);
        index[IN_ADDR_SIZE] = 0;
 
-       smux_trap(ospf_variables,
-                 sizeof ospf_variables / sizeof(struct variable),
-                 ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid,
+       smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid,
+                 array_size(ospf_trap_oid), ospf_oid,
                  sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1,
-                 ospfVirtNbrTrapList,
-                 sizeof ospfVirtNbrTrapList / sizeof(struct trap_object),
+                 ospfVirtNbrTrapList, array_size(ospfVirtNbrTrapList),
                  VIRTNBRSTATECHANGE);
 }
 
@@ -2649,13 +2644,10 @@ static void ospfTrapIfStateChange(struct ospf_interface *oi)
        oid_copy_addr(index, &(oi->address->u.prefix4), IN_ADDR_SIZE);
        index[IN_ADDR_SIZE] = 0;
 
-       smux_trap(ospf_variables,
-                 sizeof ospf_variables / sizeof(struct variable),
-                 ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid,
+       smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid,
+                 array_size(ospf_trap_oid), ospf_oid,
                  sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1,
-                 ospfIfTrapList,
-                 sizeof ospfIfTrapList / sizeof(struct trap_object),
-                 IFSTATECHANGE);
+                 ospfIfTrapList, array_size(ospfIfTrapList), IFSTATECHANGE);
 }
 
 static void ospfTrapVirtIfStateChange(struct ospf_interface *oi)
@@ -2667,12 +2659,10 @@ static void ospfTrapVirtIfStateChange(struct ospf_interface *oi)
        oid_copy_addr(index, &(oi->address->u.prefix4), IN_ADDR_SIZE);
        index[IN_ADDR_SIZE] = 0;
 
-       smux_trap(ospf_variables,
-                 sizeof ospf_variables / sizeof(struct variable),
-                 ospf_trap_oid, sizeof ospf_trap_oid / sizeof(oid), ospf_oid,
+       smux_trap(ospf_variables, array_size(ospf_variables), ospf_trap_oid,
+                 array_size(ospf_trap_oid), ospf_oid,
                  sizeof ospf_oid / sizeof(oid), index, IN_ADDR_SIZE + 1,
-                 ospfVirtIfTrapList,
-                 sizeof ospfVirtIfTrapList / sizeof(struct trap_object),
+                 ospfVirtIfTrapList, array_size(ospfVirtIfTrapList),
                  VIRTIFSTATECHANGE);
 }
 

diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index dc42899c7b924c6288e95d3a8832c4098101a0e2..5a8991c4c0b64332977c07d74239aa94b026c863 100644 (file)
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -68,7 +68,7 @@ struct zebra_privs_t pimd_privs = {
        .vty_group = VTY_GROUP,
 #endif
        .caps_p = _caps_p,
-       .cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]),
+       .cap_num_p = array_size(_caps_p),
        .cap_num_i = 0};
 
 static const struct frr_yang_module_info *pimd_yang_modules[] = {

diff --git a/tests/bgpd/test_bgp_table.c b/tests/bgpd/test_bgp_table.c
index 73243dcacf00d24bffa42112b807f207a08d6f5c..7b38df5f66a27e092c4e1a96c301ec349f87e36c 100644 (file)
--- a/tests/bgpd/test_bgp_table.c
+++ b/tests/bgpd/test_bgp_table.c
@@ -158,7 +158,7 @@ static void test_range_lookup(void)
                                  "1.16.160.0/19", "1.16.32.0/20",
                                  "1.16.32.0/21",  "16.0.0.0/16"};
 
-       int num_prefixes = sizeof(prefixes) / sizeof(prefixes[0]);
+       int num_prefixes = array_size(prefixes);
 
        for (int i = 0; i < num_prefixes; i++)
                add_node(table, prefixes[i]);

diff --git a/tests/bgpd/test_mpath.c b/tests/bgpd/test_mpath.c
index 04fbda42ebde788e5e1416eaa78739333d8fc25a..0ecd0fdfec75f0df2674688de65d9c2386a97371 100644 (file)
--- a/tests/bgpd/test_mpath.c
+++ b/tests/bgpd/test_mpath.c
@@ -205,7 +205,7 @@ struct peer test_mp_list_peer[] = {
        {.local_as = 1, .as = 2}, {.local_as = 1, .as = 2},
        {.local_as = 1, .as = 2},
 };
-int test_mp_list_peer_count = sizeof(test_mp_list_peer) / sizeof(struct peer);
+int test_mp_list_peer_count = array_size(test_mp_list_peer);
 struct attr test_mp_list_attr[4];
 struct bgp_path_info test_mp_list_info[] = {
        {.peer = &test_mp_list_peer[0], .attr = &test_mp_list_attr[0]},
@@ -214,8 +214,7 @@ struct bgp_path_info test_mp_list_info[] = {
        {.peer = &test_mp_list_peer[3], .attr = &test_mp_list_attr[2]},
        {.peer = &test_mp_list_peer[4], .attr = &test_mp_list_attr[3]},
 };
-int test_mp_list_info_count =
-       sizeof(test_mp_list_info) / sizeof(struct bgp_path_info);
+int test_mp_list_info_count = array_size(test_mp_list_info);
 
 static int setup_bgp_mp_list(testcase_t *t)
 {
@@ -370,7 +369,7 @@ testcase_t *all_tests[] = {
        &test_bgp_path_info_mpath_update,
 };
 
-int all_tests_count = (sizeof(all_tests) / sizeof(testcase_t *));
+int all_tests_count = array_size(all_tests);
 
 /*=========================================================
  * Test Driver Functions

diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c
index e203da8f6e579603f549fd99cc930aa1adfddeaf..fc3d908661f34b6af16e3017a3d20f4f8c90aac0 100644 (file)
--- a/tests/lib/test_privs.c
+++ b/tests/lib/test_privs.c
@@ -37,7 +37,7 @@ struct zebra_privs_t test_privs = {
        .vty_group = VTY_GROUP,
 #endif
        .caps_p = _caps_p,
-       .cap_num_p = sizeof(_caps_p) / sizeof(_caps_p[0]),
+       .cap_num_p = array_size(_caps_p),
        .cap_num_i = 0};
 
 struct option longopts[] = {{"help", no_argument, NULL, 'h'},

diff --git a/tests/lib/test_table.c b/tests/lib/test_table.c
index 2b65040627610f674297f8687e4ea7499dd7e400..90d6c76bf1c26a9f7c3402a759a6eb89b37e2988 100644 (file)
--- a/tests/lib/test_table.c
+++ b/tests/lib/test_table.c
@@ -478,7 +478,7 @@ static void test_iter_pause(void)
        const char *prefixes[] = {"1.0.1.0/24", "1.0.1.0/25", "1.0.1.128/25",
                                  "1.0.2.0/24", "2.0.0.0/8"};
 
-       num_prefixes = sizeof(prefixes) / sizeof(prefixes[0]);
+       num_prefixes = array_size(prefixes);
 
        printf("\n\nTesting that route_table_iter_pause() works as expected\n");
        table = route_table_init();