ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sane.ds: Avoid an ARRAY_SIZE-like macro. 

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-08-16 20:19:25 +02:00 committed by Alexandre Julliard
parent a9bc0fec92
commit 7d550de263
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/sane.ds/capability.c
View File

@ -844,7 +844,6 @@ static const supported_size_t supported_sizes[] =
{ TWSS_USEXECUTIVE, 184.15, 266.7 }, { TWSS_USEXECUTIVE, 184.15, 266.7 },
{ TWSS_A3, 297, 420 }, { 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) 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; TW_UINT16 twCC = TWCC_BADCAP;
#ifdef SONAME_LIBSANE #ifdef SONAME_LIBSANE
static TW_UINT32 possible_values[SUPPORTED_SIZE_COUNT]; static TW_UINT32 possible_values[ARRAY_SIZE(supported_sizes)];
unsigned int i; unsigned int i;
TW_UINT32 val; TW_UINT32 val;
TW_UINT16 default_size = get_default_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, SUPPORTED_SIZE_COUNT); TW_UINT16 current_size = get_current_paper_size(supported_sizes, ARRAY_SIZE(supported_sizes));
TRACE("ICAP_SUPPORTEDSIZES\n"); TRACE("ICAP_SUPPORTEDSIZES\n");
@ -946,7 +945,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16
case MSG_SET: case MSG_SET:
twCC = msg_set(pCapability, &val); twCC = msg_set(pCapability, &val);
if (twCC == TWCC_SUCCESS) 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) if (supported_sizes[i].size == val)
return set_width_height(supported_sizes[i].x, supported_sizes[i].y); 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: case MSG_RESET:
twCC = TWCC_BADCAP; 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) if (supported_sizes[i].size == default_size)
{ {
twCC = set_width_height(supported_sizes[i].x, supported_sizes[i].y); 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; break;
} }
#undef SUPPORTED_SIZE_COUNT
#endif #endif
return twCC; return twCC;
} }