Skip to content

W
wine-winehq
Commit 7d550de2 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

sane.ds: Avoid an ARRAY_SIZE-like macro.

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@winehq.org> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent a9bc0fec
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
dlls/sane.ds/capability.c
View file @ 7d550de2
......@@ -844,7 +844,6 @@ static const supported_size_t supported_sizes[] =
{ TWSS_USEXECUTIVE, 184.15, 266.7 },
{ TWSS_A3, 297, 420 },
};
#define SUPPORTED_SIZE_COUNT (sizeof(supported_sizes) / sizeof(supported_sizes[0]))
static TW_UINT16 get_default_paper_size(const supported_size_t *s, int n)
{
......@@ -920,11 +919,11 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16
TW_UINT16 twCC = TWCC_BADCAP;
#ifdef SONAME_LIBSANE
static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT];
static TW_UINT32 possible_values[ARRAY_SIZE(supported_sizes)];
unsigned int i;
TW_UINT32 val;
TW_UINT16 default_size = get_default_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT);
TW_UINT16 current_size = get_current_paper_size(supported_sizes, SUPPORTED_SIZE_COUNT);
TW_UINT16 default_size = get_default_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes));
TW_UINT16 current_size = get_current_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes));
TRACE("ICAP_SUPPORTEDSIZES\n");
......@@ -946,7 +945,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16
case MSG_SET:
twCC = msg_set(pCapability, &val);
if (twCC == TWCC_SUCCESS)
for (i = 1; i < SUPPORTED_SIZE_COUNT; i++)
for (i = 1; i < ARRAY_SIZE(supported_sizes); i++)
if (supported_sizes[i].size == val)
return set_width_height(supported_sizes[i].x, supported_sizes[i].y);
......@@ -960,7 +959,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16
case MSG_RESET:
twCC = TWCC_BADCAP;
for (i = 1; i < SUPPORTED_SIZE_COUNT; i++)
for (i = 1; i < ARRAY_SIZE(supported_sizes); i++)
if (supported_sizes[i].size == default_size)
{
twCC = set_width_height(supported_sizes[i].x, supported_sizes[i].y);
......@@ -976,7 +975,6 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16
break;
}
#undef SUPPORTED_SIZE_COUNT
#endif
return twCC;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment