msvcirt/tests: Fix indentation warnings on GCC 6.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-08-15 10:14:50 +03:00 committed by Alexandre Julliard
parent 00c591a947
commit 67d7690e53
1 changed files with 42 additions and 42 deletions

View File

@ -3121,7 +3121,7 @@ static void test_ostream(void) {
ok(os2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, os2.base_ios.do_lock); ok(os2.base_ios.do_lock == 0xcdcdcdcd, "expected %d got %d\n", 0xcdcdcdcd, os2.base_ios.do_lock);
/* flush */ /* flush */
if (0) /* crashes on native */ if (0) /* crashes on native */
pos = call_func1(p_ostream_flush, &os1); pos = call_func1(p_ostream_flush, &os1);
os1.base_ios.sb = &fb2.base; os1.base_ios.sb = &fb2.base;
call_func1(p_filebuf_ctor, &fb2); call_func1(p_filebuf_ctor, &fb2);
@ -3177,7 +3177,7 @@ if (0) /* crashes on native */
os1.base_ios.state = IOSTATE_goodbit; os1.base_ios.state = IOSTATE_goodbit;
os1.base_ios.tie = &os2; os1.base_ios.tie = &os2;
os2.base_ios.sb = NULL; os2.base_ios.sb = NULL;
if (0) /* crashes on native */ if (0) /* crashes on native */
ret = (int) call_func1(p_ostream_opfx, &os1); ret = (int) call_func1(p_ostream_opfx, &os1);
os2.base_ios.sb = &fb2.base; os2.base_ios.sb = &fb2.base;
os2.base_ios.state = IOSTATE_badbit; os2.base_ios.state = IOSTATE_badbit;
@ -3244,7 +3244,7 @@ if (0) /* crashes on native */
ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase); ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase);
ok(fb1.base.pptr == fb1.base.base + 1, "wrong put pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.pptr); ok(fb1.base.pptr == fb1.base.base + 1, "wrong put pointer, expected %p got %p\n", fb1.base.base + 1, fb1.base.pptr);
os1.base_ios.sb = NULL; os1.base_ios.sb = NULL;
if (0) /* crashes on native */ if (0) /* crashes on native */
pos = call_func2(p_ostream_put_char, &os1, 'c'); pos = call_func2(p_ostream_put_char, &os1, 'c');
os1.base_ios.sb = &fb1.base; os1.base_ios.sb = &fb1.base;
os1.base_ios.width = 5; os1.base_ios.width = 5;
@ -3276,7 +3276,7 @@ if (0) /* crashes on native */
ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase); ok(fb1.base.pbase == fb1.base.base, "wrong put base, expected %p got %p\n", fb1.base.base, fb1.base.pbase);
ok(fb1.base.pptr == fb1.base.base + 7, "wrong put pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.pptr); ok(fb1.base.pptr == fb1.base.base + 7, "wrong put pointer, expected %p got %p\n", fb1.base.base + 7, fb1.base.pptr);
os1.base_ios.sb = NULL; os1.base_ios.sb = NULL;
if (0) /* crashes on native */ if (0) /* crashes on native */
pos = call_func3(p_ostream_write_char, &os1, "been", 4); pos = call_func3(p_ostream_write_char, &os1, "been", 4);
os1.base_ios.sb = &fb1.base; os1.base_ios.sb = &fb1.base;
os1.base_ios.width = 5; os1.base_ios.width = 5;
@ -3392,7 +3392,7 @@ if (0) /* crashes on native */
pos = call_func3(p_ostream_writepad, &os1, "a", "b"); pos = call_func3(p_ostream_writepad, &os1, "a", "b");
ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos);
ok(!strncmp(fb1.base.pptr - 6, "abzzzz", 6), "expected 'abzzzz' got '%s'\n", fb1.base.pptr - 6); ok(!strncmp(fb1.base.pptr - 6, "abzzzz", 6), "expected 'abzzzz' got '%s'\n", fb1.base.pptr - 6);
if (0) /* crashes on native */ if (0) /* crashes on native */
pos = call_func3(p_ostream_writepad, &os1, NULL, "o"); pos = call_func3(p_ostream_writepad, &os1, NULL, "o");
pos = call_func3(p_ostream_writepad, &os1, "", "hello"); pos = call_func3(p_ostream_writepad, &os1, "", "hello");
ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos);
@ -3855,7 +3855,7 @@ static void test_ostream_withassign(void)
/* assignment */ /* assignment */
osa1.unknown = 0xabababab; osa1.unknown = 0xabababab;
osa1.base_ios.sb = (streambuf*) 0xabababab; osa1.base_ios.sb = (streambuf*) 0xabababab;
if (0) /* crashes on native */ if (0) /* crashes on native */
osa1.base_ios.delbuf = 0xabababab; osa1.base_ios.delbuf = 0xabababab;
posa = call_func2(p_ostream_withassign_assign_sb, &osa1, &sb); posa = call_func2(p_ostream_withassign_assign_sb, &osa1, &sb);
ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa); ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa);
@ -4035,7 +4035,7 @@ static void test_istream(void)
ok(is2.base_ios.flags == FLAGS_skipws, "expected %d got %d\n", FLAGS_skipws, is2.base_ios.flags); ok(is2.base_ios.flags == FLAGS_skipws, "expected %d got %d\n", FLAGS_skipws, is2.base_ios.flags);
ok(is2.base_ios.precision == 6, "expected 6 got %d\n", is2.base_ios.precision); ok(is2.base_ios.precision == 6, "expected 6 got %d\n", is2.base_ios.precision);
ok(is2.base_ios.width == 0, "expected 0 got %d\n", is2.base_ios.width); ok(is2.base_ios.width == 0, "expected 0 got %d\n", is2.base_ios.width);
if (0) /* crashes on native */ if (0) /* crashes on native */
pis = call_func2(p_istream_assign, &is2, NULL); pis = call_func2(p_istream_assign, &is2, NULL);
is2.extract_delim = is2.count = 0xabababab; is2.extract_delim = is2.count = 0xabababab;
is2.base_ios.sb = (streambuf*) 0xabababab; is2.base_ios.sb = (streambuf*) 0xabababab;
@ -4071,7 +4071,7 @@ if (0) /* crashes on native */
/* eatwhite */ /* eatwhite */
is1.extract_delim = is1.count = 0; is1.extract_delim = is1.count = 0;
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
is1.base_ios.state = IOSTATE_badbit; is1.base_ios.state = IOSTATE_badbit;
is1.base_ios.flags = 0; is1.base_ios.flags = 0;
@ -4139,7 +4139,7 @@ if (0) /* crashes on native */
ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.count == 0, "expected 0 got %d\n", is1.count);
ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n", ok(is1.base_ios.state == (IOSTATE_badbit|IOSTATE_failbit), "expected %d got %d\n",
IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state); IOSTATE_badbit|IOSTATE_failbit, is1.base_ios.state);
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
is1.base_ios.state = IOSTATE_goodbit; is1.base_ios.state = IOSTATE_goodbit;
is1.base_ios.tie = &os; is1.base_ios.tie = &os;
@ -4406,7 +4406,7 @@ if (0) /* crashes on native */
IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state);
ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]); ok(buffer[0] == 0, "expected 0 got %d\n", buffer[0]);
if (0) /* crashes on native */ if (0) /* crashes on native */
pis = call_func4(p_istream_get_str_delim, &is1, (char*) 0x1, 5, 0); pis = call_func4(p_istream_get_str_delim, &is1, (char*) 0x1, 5, 0);
/* get_str */ /* get_str */
@ -4544,7 +4544,7 @@ if (0) /* crashes on native */
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr); ok(fb1.base.gptr == fb1.base.base + 3, "wrong get pointer, expected %p got %p\n", fb1.base.base + 3, fb1.base.gptr);
ok(c == -50, "expected %d got %d\n", -50, c); ok(c == -50, "expected %d got %d\n", -50, c);
if (0) /* crashes on native */ if (0) /* crashes on native */
pis = call_func2(p_istream_get_char, &is1, NULL); pis = call_func2(p_istream_get_char, &is1, NULL);
fb1.base.gptr = fb1.base.base + 30; fb1.base.gptr = fb1.base.base + 30;
pis = call_func2(p_istream_get_char, &is1, &c); pis = call_func2(p_istream_get_char, &is1, &c);
@ -4656,7 +4656,7 @@ if (0) /* crashes on native */
ok(fb2.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb2.base.pptr); ok(fb2.base.pptr == NULL, "wrong put pointer, expected %p got %p\n", NULL, fb2.base.pptr);
ok(fb2.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb2.base.epptr); ok(fb2.base.epptr == NULL, "wrong put end, expected %p got %p\n", NULL, fb2.base.epptr);
is1.base_ios.state = IOSTATE_goodbit; is1.base_ios.state = IOSTATE_goodbit;
if (0) /* crashes on native */ if (0) /* crashes on native */
pis = call_func3(p_istream_get_sb, &is1, NULL, '?'); pis = call_func3(p_istream_get_sb, &is1, NULL, '?');
*fb1.base.gptr = -50; *fb1.base.gptr = -50;
pis = call_func3(p_istream_get_sb, &is1, &fb2.base, -50); pis = call_func3(p_istream_get_sb, &is1, &fb2.base, -50);
@ -4850,7 +4850,7 @@ if (0) /* crashes on native */
ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.count == 0, "expected 0 got %d\n", is1.count);
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
fb1.base.gptr = fb1.base.base + 14; fb1.base.gptr = fb1.base.base + 14;
ret = (int) call_func1(p_istream_peek, &is1); ret = (int) call_func1(p_istream_peek, &is1);
@ -4895,7 +4895,7 @@ if (0) /* crashes on native */
ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state);
ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr); ok(fb1.base.gptr == fb1.base.base + 15, "wrong get pointer, expected %p got %p\n", fb1.base.base + 15, fb1.base.gptr);
is1.base_ios.state = IOSTATE_goodbit; is1.base_ios.state = IOSTATE_goodbit;
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
pis = call_func2(p_istream_putback, &is1, -40); pis = call_func2(p_istream_putback, &is1, -40);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
@ -4953,13 +4953,13 @@ if (0) /* crashes on native */
ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
ok(!strncmp(buffer, fb1.base.base, 30), "unexpected buffer content, got '%s'\n", buffer); ok(!strncmp(buffer, fb1.base.base, 30), "unexpected buffer content, got '%s'\n", buffer);
ok(buffer[30] == 'A', "expected 'A' got %d\n", buffer[30]); ok(buffer[30] == 'A', "expected 'A' got %d\n", buffer[30]);
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
is1.base_ios.state = IOSTATE_goodbit; is1.base_ios.state = IOSTATE_goodbit;
fb1.base.eback = fb1.base.gptr = fb1.base.base; fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30; fb1.base.egptr = fb1.base.base + 30;
memset(buffer, 'A', sizeof(buffer)); memset(buffer, 'A', sizeof(buffer));
if (0) /* crashes on native */ if (0) /* crashes on native */
pis = call_func3(p_istream_read, &is1, buffer, -1); pis = call_func3(p_istream_read, &is1, buffer, -1);
pis = call_func3(p_istream_read, &is1, buffer, 0); pis = call_func3(p_istream_read, &is1, buffer, 0);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
@ -4975,7 +4975,7 @@ if (0) /* crashes on native */
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr); ok(fb1.base.gptr == NULL, "wrong get pointer, expected %p got %p\n", NULL, fb1.base.gptr);
ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd)); ok(_tell(fb1.fd) == 0, "expected 0 got %d\n", _tell(fb1.fd));
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
pis = call_func2(p_istream_seekg, &is1, -5); pis = call_func2(p_istream_seekg, &is1, -5);
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
@ -5008,7 +5008,7 @@ if (0) /* crashes on native */
ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis);
ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state);
ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr); ok(fb1.base.gptr == fb1.base.base, "wrong get pointer, expected %p got %p\n", fb1.base.base, fb1.base.gptr);
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
fb1.base.gptr = fb1.base.egptr; fb1.base.gptr = fb1.base.egptr;
pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end); pis = call_func3(p_istream_seekg_offset, &is1, 0, SEEKDIR_end);
@ -5029,7 +5029,7 @@ if (0) /* crashes on native */
ret = (int) call_func1(p_istream_sync, &is1); ret = (int) call_func1(p_istream_sync, &is1);
ok(ret == 0, "expected 0 got %d\n", ret); ok(ret == 0, "expected 0 got %d\n", ret);
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
fb1.base.eback = fb1.base.gptr = fb1.base.base; fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30; fb1.base.egptr = fb1.base.base + 30;
@ -5062,7 +5062,7 @@ if (0) /* crashes on native */
ret = (int) call_func1(p_istream_tellg, &is1); ret = (int) call_func1(p_istream_tellg, &is1);
ok(ret == 24, "expected 24 got %d\n", ret); ok(ret == 24, "expected 24 got %d\n", ret);
ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state); ok(is1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, is1.base_ios.state);
if (0) /* crashes on native */ if (0) /* crashes on native */
is1.base_ios.sb = NULL; is1.base_ios.sb = NULL;
fb1.base.eback = fb1.base.gptr = fb1.base.base; fb1.base.eback = fb1.base.gptr = fb1.base.base;
fb1.base.egptr = fb1.base.base + 30; fb1.base.egptr = fb1.base.base + 30;
@ -6014,7 +6014,7 @@ static void test_iostream(void)
ios2.base1.count = 0xcdcdcdcd; ios2.base1.count = 0xcdcdcdcd;
memset(&ios2.base_ios, 0xcd, sizeof(ios)); memset(&ios2.base_ios, 0xcd, sizeof(ios));
ios2.base_ios.delbuf = 0; ios2.base_ios.delbuf = 0;
if (0) /* crashes on native */ if (0) /* crashes on native */
pios = call_func2(p_iostream_assign, &ios2, NULL); pios = call_func2(p_iostream_assign, &ios2, NULL);
pios = call_func2(p_iostream_assign, &ios2, &ios1); pios = call_func2(p_iostream_assign, &ios2, &ios1);
ok(pios == &ios2, "wrong return, expected %p got %p\n", &ios2, pios); ok(pios == &ios2, "wrong return, expected %p got %p\n", &ios2, pios);