Skip to content

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

msvcp90/tests: Use the available ARRAY_SIZE() macro.

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@winehq.org> Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d9a60ebf
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
dlls/msvcp90/tests/ios.c
View file @ c52a7b19
...@@ -1137,7 +1137,7 @@ static void test_num_get_get_uint64(void) ...@@ -1137,7 +1137,7 @@ static void test_num_get_get_uint64(void)
{ "0xx10", NULL, FMTFLAG_hex, IOSTATE_failbit, 42, EOF }, { "0xx10", NULL, FMTFLAG_hex, IOSTATE_failbit, 42, EOF },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1287,7 +1287,7 @@ static void test_num_get_get_double(void) ...@@ -1287,7 +1287,7 @@ static void test_num_get_get_double(void)
{ "1.0e1,0", NULL, IOSTATE_goodbit, 10.0, ',' }, /* group in exponent */ { "1.0e1,0", NULL, IOSTATE_goodbit, 10.0, ',' }, /* group in exponent */
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1406,7 +1406,7 @@ static void test_num_put_put_double(void) ...@@ -1406,7 +1406,7 @@ static void test_num_put_put_double(void)
{ -1.23456789e-9, NULL, 9, FMTFLAG_fixed, "-0.000000001" } { -1.23456789e-9, NULL, 9, FMTFLAG_fixed, "-0.000000001" }
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func1(p_basic_stringstream_char_ctor, &ss); call_func1(p_basic_stringstream_char_ctor, &ss);
...@@ -1499,7 +1499,7 @@ static void test_istream_ipfx(void) ...@@ -1499,7 +1499,7 @@ static void test_istream_ipfx(void)
{ "\n\t ws", TRUE, FALSE, TRUE, IOSTATE_goodbit, '\n' }, { "\n\t ws", TRUE, FALSE, TRUE, IOSTATE_goodbit, '\n' },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1579,7 +1579,7 @@ static void test_istream_ignore(void) ...@@ -1579,7 +1579,7 @@ static void test_istream_ignore(void)
{ "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */ { "ABC ", 42, ' ', IOSTATE_goodbit, EOF }, /* delim at end */
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1643,7 +1643,7 @@ static void test_istream_seekg(void) ...@@ -1643,7 +1643,7 @@ static void test_istream_seekg(void)
{ "", 0, SEEKDIR_beg, IOSTATE_failbit, EOF }, { "", 0, SEEKDIR_beg, IOSTATE_failbit, EOF },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1702,7 +1702,7 @@ static void test_istream_seekg_fpos(void) ...@@ -1702,7 +1702,7 @@ static void test_istream_seekg_fpos(void)
{ "", 0, IOSTATE_failbit, EOF }, { "", 0, IOSTATE_failbit, EOF },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1763,7 +1763,7 @@ static void test_istream_peek(void) ...@@ -1763,7 +1763,7 @@ static void test_istream_peek(void)
{ "ABCDEF", 'A', 'A', IOSTATE_goodbit }, { "ABCDEF", 'A', 'A', IOSTATE_goodbit },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1834,7 +1834,7 @@ static void test_istream_tellg(void) ...@@ -1834,7 +1834,7 @@ static void test_istream_tellg(void)
{ "ABCDEFGHIJ", -6, -1, -1, 0 } { "ABCDEFGHIJ", -6, -1, -1, 0 }
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* stringstream<char> version */ /* stringstream<char> version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -1980,7 +1980,7 @@ static void test_istream_getline(void) ...@@ -1980,7 +1980,7 @@ static void test_istream_getline(void)
{ "this is some text\n", "this is some text\n", '\0', IOSTATE_eofbit, "this is some text\n", '\n', IOSTATE_faileof }, { "this is some text\n", "this is some text\n", '\0', IOSTATE_eofbit, "this is some text\n", '\n', IOSTATE_faileof },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
/* char version */ /* char version */
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
...@@ -2208,7 +2208,7 @@ static void test_ostream_print_complex_float(void) ...@@ -2208,7 +2208,7 @@ static void test_ostream_print_complex_float(void)
{ {-1.23456789e-9,2.3456789e9}, NULL, 9, FMTFLAG_fixed, "(-0.000000001,2345678848.000000000)" } { {-1.23456789e-9,2.3456789e9}, NULL, 9, FMTFLAG_fixed, "(-0.000000001,2345678848.000000000)" }
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
call_func1(p_basic_stringstream_char_ctor, &ss); call_func1(p_basic_stringstream_char_ctor, &ss);
if(tests[i].lcl) { if(tests[i].lcl) {
...@@ -2331,7 +2331,7 @@ static void test_istream_read_complex_double(void) ...@@ -2331,7 +2331,7 @@ static void test_istream_read_complex_double(void)
{ "(1.0eE10, 3)" , NULL, deadbeef, IOSTATE_failbit, ""}, { "(1.0eE10, 3)" , NULL, deadbeef, IOSTATE_failbit, ""},
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
call_func2(p_basic_string_char_ctor_cstr, &str, deadbeef_str); call_func2(p_basic_string_char_ctor_cstr, &str, deadbeef_str);
call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE);
p_basic_istream_char_read_complex_double(&ss.base.base1, &val); p_basic_istream_char_read_complex_double(&ss.base.base1, &val);
......
dlls/msvcp90/tests/misc.c
View file @ c52a7b19
...@@ -582,7 +582,7 @@ static void test_wctype(void) ...@@ -582,7 +582,7 @@ static void test_wctype(void)
}; };
int i, ret; int i, ret;
for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { for(i=0; i<ARRAY_SIZE(properties); i++) {
ret = p_wctype(properties[i].name); ret = p_wctype(properties[i].name);
ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret);
} }
......
dlls/msvcp90/tests/string.c
View file @ c52a7b19
...@@ -554,7 +554,7 @@ static void test_basic_string_char_rfind(void) { ...@@ -554,7 +554,7 @@ static void test_basic_string_char_rfind(void) {
{ "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */ { "aaa", "z", 0, 1, *p_basic_string_char_npos } /* can't find */
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str, ret = (size_t)call_func4(p_basic_string_char_rfind_cstr_substr, &str,
...@@ -602,7 +602,7 @@ static void test_basic_string_char_replace(void) { ...@@ -602,7 +602,7 @@ static void test_basic_string_char_replace(void) {
{ "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */ { "ABCDEF", 6, *p_basic_string_char_npos, "-", "ABCDEF-" }, /* replace after end with npos */
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace);
...@@ -756,7 +756,7 @@ static void test_basic_string_char_find_last_not_of(void) { ...@@ -756,7 +756,7 @@ static void test_basic_string_char_find_last_not_of(void) {
{ "ABCDE", "", 5, 0, 4 }, { "ABCDE", "", 5, 0, 4 },
}; };
for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { for(i=0; i<ARRAY_SIZE(tests); i++) {
call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str);
ret = (size_t)call_func4(p_basic_string_char_find_last_not_of_cstr_substr, ret = (size_t)call_func4(p_basic_string_char_find_last_not_of_cstr_substr,
......
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