diff options
Diffstat (limited to 'libstdc++-v3/testsuite/27_io/basic_filebuf')
28 files changed, 74 insertions, 72 deletions
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc index 6dc56f9b154..0a12e722450 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -61,19 +61,19 @@ void test_01() // filebuf_type* close() std::filebuf* f; f = fb_01.close(); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( !fb_01.is_open() ); f = fb_02.close(); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( !fb_02.is_open() ); f = fb_03.close(); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( !fb_03.is_open() ); f = fb_03.close(); - VERIFY( f == NULL ); + VERIFY( !f ); VERIFY( !fb_03.is_open() ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc index 2074ee78a0b..fe0624d109e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/12790-3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -71,7 +71,7 @@ void test01() VERIFY( !cvt->unshift_called ); filebuf* ret = fb.close(); VERIFY( cvt->unshift_called ); - VERIFY( ret == NULL ); + VERIFY( !ret ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc index 9d0cb0f7499..c1a0f79c8e2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -48,7 +48,7 @@ void test_02() // read (ext) FILE* f2 = fopen(name_01, "r"); - VERIFY( f2 != NULL ); + VERIFY( f2 ); if (f2) { __gnu_cxx::stdio_filebuf<char> fb(f2, std::ios_base::in, 512); @@ -58,7 +58,7 @@ void test_02() // read (standard) FILE* f = fopen(name_01, "r"); - VERIFY( f != NULL ); + VERIFY( f ); if (f) { std::ifstream ifstream1(name_01); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc index e520682b112..f2c5abc3eb3 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/9964.cc @@ -1,7 +1,7 @@ // { dg-require-fork "" } // { dg-require-mkfifo "" } -// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 +// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -69,14 +69,14 @@ bool test_07() filebuf fb; filebuf* ret = fb.open(name, ios_base::in | ios_base::out); - VERIFY( ret != NULL ); + VERIFY( ret != 0 ); VERIFY( fb.is_open() ); s1.signal(); s2.wait(); fb.sputc('a'); ret = fb.close(); - VERIFY( ret != NULL ); + VERIFY( ret != 0 ); VERIFY( !fb.is_open() ); return test; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc index baa4ed31eb8..417fbc2ce39 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -69,7 +69,7 @@ void test01() VERIFY( !cvt->unshift_called ); wfilebuf* ret = fb.close(); VERIFY( cvt->unshift_called ); - VERIFY( ret == NULL ); + VERIFY( !ret ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc index a3a78120e78..b233f65637e 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/14975-2.cc @@ -4,7 +4,8 @@ // 2004-04-16 Petur Runolfsson <peturr02@ru.is> -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -68,7 +69,7 @@ bool test01() wfilebuf fb; fb.pubimbue(loc_us); wfilebuf* ret = fb.open(name, ios_base::out); - VERIFY( ret != NULL ); + VERIFY( ret != 0 ); VERIFY( fb.is_open() ); s1.wait(); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc index e10bd9153f2..1a40da155cf 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -53,11 +53,11 @@ void test_01() // Should keep the old file attached, and disregard attempt to overthrow. std::filebuf* f = fb_02.open(name_02, std::ios_base::in | std::ios_base::out | std::ios_base::trunc); - VERIFY( f != NULL ); + VERIFY( f ); VERIFY( fb_02.is_open() ); f = fb_02.open(name_03, std::ios_base::in | std::ios_base::out); - VERIFY( f == NULL ); + VERIFY( !f ); VERIFY( fb_02.is_open() ); fb_03.open(name_03, std::ios_base::out | std::ios_base::trunc); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc index 1bd81ee14d9..755784fb9ae 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test_03() int first_fd = ::open(name_01, O_RDONLY); VERIFY( first_fd != -1 ); FILE* first_file = ::fdopen(first_fd, "r"); - VERIFY( first_file != NULL ); + VERIFY( first_file ); __gnu_cxx::stdio_filebuf<char> fb(first_file, std::ios_base::in); int second_fd = fb.fd(); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc index cfec76b310b..5b404375e63 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/9507.cc @@ -1,6 +1,7 @@ // { dg-require-mkfifo "" } -// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2005, 2009, 2010 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -55,7 +56,7 @@ void test_06() std::ios_base::in | std::ios_base::out | std::ios_base::ate); - if (r == NULL) + if (!r) VERIFY( !fbuf.is_open() ); else VERIFY( fbuf.is_open() ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc index db02187dece..d762fb48c2c 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-1.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -37,7 +37,7 @@ void test01() wfilebuf* f = fb.close(); VERIFY( n1 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc index 9ea64cc3e93..f11916e6f77 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-2.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -39,7 +39,7 @@ void test02() VERIFY( n1 != wfilebuf::traits_type::eof() ); VERIFY( n2 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc index 2f10e0dec42..2be9b52cbd2 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-3.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -36,7 +36,7 @@ void test03() wfilebuf* f = fb.close(); VERIFY( n1 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc index a03d9e8d1ab..7b48bfe7bb9 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/overflow/wchar_t/11305-4.cc @@ -1,6 +1,6 @@ // { dg-require-namedlocale "" } -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -38,7 +38,7 @@ void test04() VERIFY( n1 != wfilebuf::traits_type::eof() ); VERIFY( n2 != wfilebuf::traits_type::eof() ); - VERIFY( f != NULL ); + VERIFY( f ); } int main() diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc index 53ee751ed44..3bf4353d7e6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/12790-4.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2003, 2005, 2009 Free Software Foundation, Inc. +// Copyright (C) 2003, 2005, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -47,7 +47,7 @@ void test01() fb.sputc(pod_uchar::from<char>(0xff)); // Check that seekoff sets the current state during output - traits_type::pos_type pos = fb.pubseekoff(0, ios_base::cur); + fb.pubseekoff(0, ios_base::cur); fb.sputc(pod_uchar::from<char>('a')); fb.sputc(pod_uchar::from<char>(0xff)); fb.sputc(pod_uchar::from<char>(0)); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc index 3d26c1cfc57..24887461719 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test05() typedef filebuf::traits_type traits_type; bool test __attribute__((unused)) = true; - streamsize strmsz_1, strmsz_2; + streamsize strmsz_1; int_type c1; int_type c2; @@ -65,7 +65,7 @@ void test05() //beg strmsz_1 = fb.in_avail(); pt_1 = fb.pubseekoff(2, ios_base::beg); - strmsz_2 = fb.in_avail(); + fb.in_avail(); off_1 = off_type(pt_1); VERIFY( off_1 > 0 ); c1 = fb.snextc(); //current in pointer +1 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc index bb175150556..4dc6d8648be 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test05() typedef filebuf::off_type off_type; bool test __attribute__((unused)) = true; - streamsize strmsz_1, strmsz_2; + streamsize strmsz_1; int_type c1; int_type c2; @@ -66,7 +66,7 @@ void test05() //beg strmsz_1 = fb.in_avail(); pt_1 = fb.pubseekoff(2, ios_base::beg); - strmsz_2 = fb.in_avail(); + fb.in_avail(); off_1 = off_type(pt_1); VERIFY( off_1 > 0 ); c1 = fb.snextc(); //current in pointer +1 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc index f786504984d..8d7ab1dfc11 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test05() typedef filebuf::traits_type traits_type; bool test __attribute__((unused)) = true; - streamsize strmsz_1, strmsz_2; + streamsize strmsz_1; int_type c1; int_type c2; @@ -66,7 +66,7 @@ void test05() //beg strmsz_1 = fb.in_avail(); pt_1 = fb.pubseekoff(2, ios_base::beg); - strmsz_2 = fb.in_avail(); + fb.in_avail(); off_1 = off_type(pt_1); VERIFY( off_1 > 0 ); c1 = fb.snextc(); //current in pointer +1 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc index f8385b25a8a..3a8809da2f6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test05() typedef filebuf::traits_type traits_type; bool test __attribute__((unused)) = true; - streamsize strmsz_1, strmsz_2; + streamsize strmsz_1; int_type c1; int_type c2; @@ -66,7 +66,7 @@ void test05() //beg strmsz_1 = fb.in_avail(); pt_1 = fb.pubseekoff(2, ios_base::beg); - strmsz_2 = fb.in_avail(); + fb.in_avail(); off_1 = off_type(pt_1); VERIFY( off_1 > 0 ); c1 = fb.snextc(); //current in pointer +1 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc index 67a376e67c4..89fab2aed90 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test05() typedef filebuf::off_type off_type; bool test __attribute__((unused)) = true; - streamsize strmsz_1, strmsz_2; + streamsize strmsz_1; int_type c1; int_type c2; @@ -66,7 +66,7 @@ void test05() //beg strmsz_1 = fb.in_avail(); pt_1 = fb.pubseekoff(2, ios_base::beg); - strmsz_2 = fb.in_avail(); + fb.in_avail(); off_1 = off_type(pt_1); VERIFY( off_1 > 0 ); c1 = fb.snextc(); //current in pointer +1 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc index e1e98261f22..b1ad66e8933 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test05() typedef filebuf::traits_type traits_type; bool test __attribute__((unused)) = true; - streamsize strmsz_1, strmsz_2; + streamsize strmsz_1; int_type c1; int_type c2; @@ -66,7 +66,7 @@ void test05() //beg strmsz_1 = fb.in_avail(); pt_1 = fb.pubseekoff(2, ios_base::beg); - strmsz_2 = fb.in_avail(); + fb.in_avail(); off_1 = off_type(pt_1); VERIFY( off_1 > 0 ); c1 = fb.snextc(); //current in pointer +1 diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc index 3b434ba7a52..42688e825e0 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -40,8 +40,8 @@ public: check_pointers() { bool test __attribute__((unused)) = true; - test = (this->pbase() == NULL); - test &= (this->pptr() == NULL); + test = (!this->pbase()); + test &= (!this->pptr()); return test; } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc index ff22967600e..b736b146070 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/12875-2.cc @@ -44,7 +44,7 @@ void test02() FILE* in = fopen(name, "r"); char str[256]; - fgets(str, 256, in); + VERIFY( fgets(str, 256, in) ); VERIFY( !strcmp(str, "Hello, world") ); fclose(in); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc index e24941e06af..fd332b68365 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-out.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -40,7 +40,7 @@ void test05() streamsize strmsz_1, strmsz_2; char carray2[8192] = ""; - int_type c2, c4; + int_type c2; // streamsize sgetn(char_type *s, streamsize n) // streamsize xsgetn(char_type *s, streamsize n) @@ -63,7 +63,7 @@ void test05() strmsz_2 = fb_02.sgetn(carray2, strmsz_1 + 5); VERIFY( strmsz_1 == -1 ); VERIFY( strmsz_2 == 0 ); - c4 = fb_02.sgetc(); + fb_02.sgetc(); VERIFY( fb_02.unbuffered() ); VERIFY( !fb_02.read_position() ); } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc index 4fd2d47130e..a2368f93203 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc index 89ec0e53d1f..c84a079d298 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1057.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009 +// Copyright (C) 1999, 2000, 2001, 2002, 2003, 2009, 2010 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -32,7 +32,7 @@ public: nullsetpbuf() { setp(foo, foo + 64); - setp(NULL, NULL); + setp(0, 0); } }; diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc index 07b971ec5c4..54a1372b467 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-io.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test01() bool test __attribute__((unused)) = true; streamsize strmsz_1, strmsz_2; - int_type c1, c2, c3; + int_type c1, c2; // int_type sungetc() // if in_cur not avail, return pbackfail(), else decrement and @@ -56,7 +56,7 @@ void test01() fb_01.sputc('u'); fb_01.sputc('v'); fb_01.pubseekoff(-1, std::ios_base::end); - c3 = fb_01.sbumpc(); + fb_01.sbumpc(); strmsz_1 = fb_01.in_avail(); c2 = fb_01.sungetc(); strmsz_2 = fb_01.in_avail(); @@ -68,7 +68,7 @@ void test01() c1 = fb_01.sgetc(); c2 = fb_01.sungetc(); strmsz_2 = fb_01.in_avail(); // 1 - c3 = fb_01.sgetc(); + fb_01.sgetc(); VERIFY( c1 != c2 ); VERIFY( strmsz_2 != strmsz_1 ); VERIFY( strmsz_2 == 1 ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc index 753154ea0ae..782a83db91d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-io.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002, 2003, 2009 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2009, 2010 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -41,7 +41,7 @@ void test01() bool test __attribute__((unused)) = true; streamsize strmsz_1, strmsz_2; - int_type c1, c2, c3; + int_type c1, c2; // int_type sungetc() // if in_cur not avail, return pbackfail(), else decrement and @@ -56,7 +56,7 @@ void test01() fb_01.sputc('u'); fb_01.sputc('v'); fb_01.pubseekoff(-1, std::ios_base::end); - c3 = fb_01.sbumpc(); + fb_01.sbumpc(); strmsz_1 = fb_01.in_avail(); c2 = fb_01.sungetc(); strmsz_2 = fb_01.in_avail(); @@ -68,7 +68,7 @@ void test01() c1 = fb_01.sgetc(); c2 = fb_01.sungetc(); strmsz_2 = fb_01.in_avail(); // 1 - c3 = fb_01.sgetc(); + fb_01.sgetc(); VERIFY( c1 != c2 ); VERIFY( strmsz_2 != strmsz_1 ); VERIFY( strmsz_2 == 1 ); diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc index ff1cc405bd3..f6a2eaca94b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc @@ -161,7 +161,7 @@ void test02() const char* name = "tmp_11544-2"; FILE* f = fopen(name, "w"); - fwrite("aaaab", 1, 5, f); + VERIFY( fwrite("aaaab", 1, 5, f) == 5 ); fclose(f); wifstream in; |