ATF-devel archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: [PATCH] compiler warnings for NULL usage in a comparison



2009/5/30 Charles Hardin <ckhardin%gmail.com@localhost>:
> Using the tip of the mtn tree, the setup used -Werror on the compile
> that was generating the following problems.
[...]
> -Wsign-promo -Wsynth -MT tests/atf/atf-c++/t_check.o -MD -MP -MF
> $depbase.Tpo -c -o tests/atf/atf-c++/t_check.o
> tests/atf/atf-c++/t_check.cpp &&\
> mv -f $depbase.Tpo $depbase.Po
> cc1plus: warnings being treated as errors
> tests/atf/atf-c++/t_check.cpp: In member function ‘virtual void
> atfu_tc_argv_array_assign::body() const’:
> tests/atf/atf-c++/t_check.cpp:269: warning: passing NULL to
> non-pointer argument 1 of ‘std::basic_ostream<_CharT, _Traits>&
> std::basic_ostream<_CharT, _Traits>::operator<<(long int) [with _CharT
> = char, _Traits = std::char_traits<char>]’

Could you try with the following patch instead?

#
# old_revision [b46e25b7dd691d2b29d6633030ecc3ba4c6f5a27]
#
# patch "tests/atf/atf-c++/t_check.cpp"
#  from [63ee0a6d3ed1771dbbe74c5d91d1a3fea8b37ead]
#    to [46ce215636cd725efe597f94351cf98268cda4b1]
#
============================================================
--- tests/atf/atf-c++/t_check.cpp       63ee0a6d3ed1771dbbe74c5d91d1a3fea8b37ead
+++ tests/atf/atf-c++/t_check.cpp       46ce215636cd725efe597f94351cf98268cda4b1
@@ -247,7 +247,7 @@ ATF_TEST_CASE_BODY(argv_array_assign)
     {
         const char* const* eargv2 = argv2->exec_argv();
         ATF_CHECK(std::strcmp(eargv2[0], carray1[0]) == 0);
-        ATF_CHECK_EQUAL(eargv2[1], NULL);
+        ATF_CHECK_EQUAL(eargv2[1], static_cast< const char * >(NULL));
     }

     argv2.release();
@@ -276,7 +276,7 @@ ATF_TEST_CASE_BODY(argv_array_copy)
     {
         const char* const* eargv2 = argv2->exec_argv();
         ATF_CHECK(std::strcmp(eargv2[0], carray[0]) == 0);
-        ATF_CHECK_EQUAL(eargv2[1], NULL);
+        ATF_CHECK_EQUAL(eargv2[1], static_cast< const char * >(NULL));
     }

     argv2.release();
@@ -296,7 +296,7 @@ ATF_TEST_CASE_BODY(argv_array_exec_argv)
         argv_array argv;
         const char* const* eargv = argv.exec_argv();
         ATF_CHECK_EQUAL(array_size(eargv), 0);
-        ATF_CHECK_EQUAL(eargv[0], NULL);
+        ATF_CHECK_EQUAL(eargv[0], static_cast< const char * >(NULL));
     }

     {
@@ -305,7 +305,7 @@ ATF_TEST_CASE_BODY(argv_array_exec_argv)
         const char* const* eargv = argv.exec_argv();
         ATF_CHECK_EQUAL(array_size(eargv), 1);
         ATF_CHECK(std::strcmp(eargv[0], "arg0") == 0);
-        ATF_CHECK_EQUAL(eargv[1], NULL);
+        ATF_CHECK_EQUAL(eargv[1], static_cast< const char * >(NULL));
     }

     {
@@ -315,7 +315,7 @@ ATF_TEST_CASE_BODY(argv_array_exec_argv)
         const char* const* eargv = argv.exec_argv();
         ATF_CHECK_EQUAL(array_size(eargv), 1);
         ATF_CHECK(std::strcmp(eargv[0], "arg0") == 0);
-        ATF_CHECK_EQUAL(eargv[1], NULL);
+        ATF_CHECK_EQUAL(eargv[1], static_cast< const char * >(NULL));
     }
 }

Thanks,

-- 
Julio Merino


Home | Main Index | Thread Index | Old Index