[PATCH] oledb32: Use the ARRAY_SIZE() macro

Michael Stefaniuc mstefani at winehq.org
Wed Jul 18 16:01:31 CDT 2018


Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
 dlls/oledb32/datainit.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c
index 7d78e9fca2..6b05ef6389 100644
--- 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;
-- 
2.14.4




More information about the wine-devel mailing list