oledb32: Use the ARRAY_SIZE() macro.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oledb32: Use the ARRAY_SIZE() macro.
3ba9ba7a · Michael Stefaniuc · Alexandre Julliard · 3a61d1d5 · 3ba9ba7a
Commit 3ba9ba7a authored Jul 18, 2018 by Michael Stefaniuc Committed by Alexandre Julliard Jul 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

datainit.c dlls/oledb32/datainit.c +4 -4

No files found.
--- a/dlls/oledb32/datainit.c
+++ b/dlls/oledb32/datainit.c
@@ -328,8 +328,8 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest)
    };
    struct mode_propval *prop;

-    if ((prop = bsearch(src, mode_propvals, sizeof(mode_propvals) / sizeof(*mode_propvals),
-        sizeof(struct mode_propval), dbmodeprop_compare)))
+    if ((prop = bsearch(src, mode_propvals, ARRAY_SIZE(mode_propvals),
+                        sizeof(struct mode_propval), dbmodeprop_compare)))
    {
        V_VT(dest) = VT_I4;
        V_I4(dest) = prop->value;
@@ -511,7 +511,7 @@ static const struct dbproperty *get_known_dprop_descr(BSTR name)
    int min, max, n;

    min = 0;
-    max = sizeof(dbproperties)/sizeof(struct dbproperty) - 1;
+    max = ARRAY_SIZE(dbproperties) - 1;

    while (min <= max)
    {
@@ -662,7 +662,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID
        WCHAR *start, *progid;
        int len;

-        prov += sizeof(providerW)/sizeof(WCHAR)-1;
+        prov += ARRAY_SIZE(providerW)-1;
        start = prov;
        while (*prov && *prov != ';')
            ++prov;