Michael Stefaniuc : oledb32: Use the ARRAY_SIZE() macro.
Module: wine Branch: master Commit: 3ba9ba7af518b99b977acf14fc3cdc109b747a94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba9ba7af518b99b977acf14f... Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 18 23:01:31 2018 +0200 oledb32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)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 7d78e9f..6b05ef6 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;
participants (1)
-
Alexandre Julliard