From 0069cc4a298a15c84df5e09e4abebe8ba8a0b8a5 Mon Sep 17 00:00:00 2001 From: Roger Meier Date: Wed, 13 Oct 2010 18:10:18 +0000 Subject: [PATCH] THRIFT-916 no errors on GNU/Linux when compiling with CXXFLAGS="-Wall -Wextra -pedantic" git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@1022220 13f79535-47bb-0310-9956-ffa450edef68 --- compiler/cpp/src/generate/t_as3_generator.cc | 3 ++- compiler/cpp/src/generate/t_cocoa_generator.cc | 3 ++- compiler/cpp/src/generate/t_cpp_generator.cc | 3 ++- compiler/cpp/src/generate/t_csharp_generator.cc | 3 ++- compiler/cpp/src/generate/t_erl_generator.cc | 3 ++- compiler/cpp/src/generate/t_hs_generator.cc | 3 ++- compiler/cpp/src/generate/t_html_generator.cc | 3 ++- compiler/cpp/src/generate/t_java_generator.cc | 2 +- compiler/cpp/src/generate/t_javame_generator.cc | 3 ++- compiler/cpp/src/generate/t_js_generator.cc | 3 ++- compiler/cpp/src/generate/t_ocaml_generator.cc | 3 ++- compiler/cpp/src/generate/t_perl_generator.cc | 3 ++- compiler/cpp/src/generate/t_php_generator.cc | 3 ++- compiler/cpp/src/generate/t_py_generator.cc | 3 ++- compiler/cpp/src/generate/t_rb_generator.cc | 3 ++- compiler/cpp/src/generate/t_st_generator.cc | 3 ++- compiler/cpp/src/generate/t_xsd_generator.cc | 3 ++- compiler/cpp/src/parse/t_field.h | 2 +- lib/cpp/src/concurrency/Mutex.h | 2 +- lib/cpp/src/protocol/TCompactProtocol.tcc | 2 +- lib/cpp/src/server/TThreadPoolServer.cpp | 2 +- lib/cpp/src/transport/TFileTransport.cpp | 7 ++++--- lib/cpp/test/TBufferBaseTest.cpp | 5 +++-- lib/cpp/test/TMemoryBufferTest.cpp | 5 +++-- lib/cpp/test/TransportTest.cpp | 5 +++-- 25 files changed, 50 insertions(+), 30 deletions(-) diff --git a/compiler/cpp/src/generate/t_as3_generator.cc b/compiler/cpp/src/generate/t_as3_generator.cc index fa0a1feb..d06d9337 100644 --- a/compiler/cpp/src/generate/t_as3_generator.cc +++ b/compiler/cpp/src/generate/t_as3_generator.cc @@ -2595,4 +2595,5 @@ std::string t_as3_generator::get_enum_class_name(t_type* type) { THRIFT_REGISTER_GENERATOR(as3, "AS3", " bindable: Add [bindable] metadata to all the struct classes.\n" -); +) + diff --git a/compiler/cpp/src/generate/t_cocoa_generator.cc b/compiler/cpp/src/generate/t_cocoa_generator.cc index d9b53f60..29ace00b 100644 --- a/compiler/cpp/src/generate/t_cocoa_generator.cc +++ b/compiler/cpp/src/generate/t_cocoa_generator.cc @@ -2462,4 +2462,5 @@ string t_cocoa_generator::call_field_setter(t_field* tfield, string fieldName) { THRIFT_REGISTER_GENERATOR(cocoa, "Cocoa", " log_unexpected: Log every time an unexpected field ID or type is encountered.\n" -); +) + diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc index 55cb4ca8..f5c8def8 100644 --- a/compiler/cpp/src/generate/t_cpp_generator.cc +++ b/compiler/cpp/src/generate/t_cpp_generator.cc @@ -4118,4 +4118,5 @@ THRIFT_REGISTER_GENERATOR(cpp, "C++", " pure_enums: Generate pure enums instead of wrapper classes.\n" " dense: Generate type specifications for the dense protocol.\n" " include_prefix: Use full include paths in generated files.\n" -); +) + diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc b/compiler/cpp/src/generate/t_csharp_generator.cc index 4b26c98e..123795c7 100644 --- a/compiler/cpp/src/generate/t_csharp_generator.cc +++ b/compiler/cpp/src/generate/t_csharp_generator.cc @@ -1697,4 +1697,5 @@ string t_csharp_generator::type_to_enum(t_type* type) { } -THRIFT_REGISTER_GENERATOR(csharp, "C#", ""); +THRIFT_REGISTER_GENERATOR(csharp, "C#", "") + diff --git a/compiler/cpp/src/generate/t_erl_generator.cc b/compiler/cpp/src/generate/t_erl_generator.cc index f8bfde3d..7e2ac75c 100644 --- a/compiler/cpp/src/generate/t_erl_generator.cc +++ b/compiler/cpp/src/generate/t_erl_generator.cc @@ -921,4 +921,5 @@ std::string t_erl_generator::type_module(t_type* ttype) { return uncapitalize(ttype->get_program()->get_name()) + "_types"; } -THRIFT_REGISTER_GENERATOR(erl, "Erlang", ""); +THRIFT_REGISTER_GENERATOR(erl, "Erlang", "") + diff --git a/compiler/cpp/src/generate/t_hs_generator.cc b/compiler/cpp/src/generate/t_hs_generator.cc index 43bc3971..c41ff68f 100644 --- a/compiler/cpp/src/generate/t_hs_generator.cc +++ b/compiler/cpp/src/generate/t_hs_generator.cc @@ -1468,4 +1468,5 @@ string t_hs_generator::render_hs_type(t_type* type, bool needs_parens) { } -THRIFT_REGISTER_GENERATOR(hs, "Haskell", ""); +THRIFT_REGISTER_GENERATOR(hs, "Haskell", "") + diff --git a/compiler/cpp/src/generate/t_html_generator.cc b/compiler/cpp/src/generate/t_html_generator.cc index 2bf05237..d1b2f055 100644 --- a/compiler/cpp/src/generate/t_html_generator.cc +++ b/compiler/cpp/src/generate/t_html_generator.cc @@ -644,4 +644,5 @@ void t_html_generator::generate_service(t_service* tservice) { } } -THRIFT_REGISTER_GENERATOR(html, "HTML", ""); +THRIFT_REGISTER_GENERATOR(html, "HTML", "") + diff --git a/compiler/cpp/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc index ae4a5a9d..134a826c 100644 --- a/compiler/cpp/src/generate/t_java_generator.cc +++ b/compiler/cpp/src/generate/t_java_generator.cc @@ -3924,5 +3924,5 @@ THRIFT_REGISTER_GENERATOR(java, "Java", " private-members: Members will be private, but setter methods will return 'this' like usual.\n" " nocamel: Do not use CamelCase field accessors with beans.\n" " hashcode: Generate quality hashCode methods.\n" -); +) diff --git a/compiler/cpp/src/generate/t_javame_generator.cc b/compiler/cpp/src/generate/t_javame_generator.cc index 696db695..ff2d285a 100644 --- a/compiler/cpp/src/generate/t_javame_generator.cc +++ b/compiler/cpp/src/generate/t_javame_generator.cc @@ -3375,4 +3375,5 @@ void t_javame_generator::generate_java_struct_clear(std::ofstream& out, t_struct indent(out) << "}" << endl << endl; } -THRIFT_REGISTER_GENERATOR(javame, "Java ME", ""); +THRIFT_REGISTER_GENERATOR(javame, "Java ME", "") + diff --git a/compiler/cpp/src/generate/t_js_generator.cc b/compiler/cpp/src/generate/t_js_generator.cc index c3306579..19ec1565 100644 --- a/compiler/cpp/src/generate/t_js_generator.cc +++ b/compiler/cpp/src/generate/t_js_generator.cc @@ -1469,4 +1469,5 @@ string t_js_generator ::type_to_enum(t_type* type) { } -THRIFT_REGISTER_GENERATOR(js, "Javascript", ""); +THRIFT_REGISTER_GENERATOR(js, "Javascript", "") + diff --git a/compiler/cpp/src/generate/t_ocaml_generator.cc b/compiler/cpp/src/generate/t_ocaml_generator.cc index 1db77b3c..5ed4a99b 100644 --- a/compiler/cpp/src/generate/t_ocaml_generator.cc +++ b/compiler/cpp/src/generate/t_ocaml_generator.cc @@ -1873,4 +1873,5 @@ string t_ocaml_generator::render_ocaml_type(t_type* type) { } -THRIFT_REGISTER_GENERATOR(ocaml, "OCaml", ""); +THRIFT_REGISTER_GENERATOR(ocaml, "OCaml", "") + diff --git a/compiler/cpp/src/generate/t_perl_generator.cc b/compiler/cpp/src/generate/t_perl_generator.cc index d3d82362..33589c21 100644 --- a/compiler/cpp/src/generate/t_perl_generator.cc +++ b/compiler/cpp/src/generate/t_perl_generator.cc @@ -1803,4 +1803,5 @@ string t_perl_generator ::type_to_enum(t_type* type) { throw "INVALID TYPE IN type_to_enum: " + type->get_name(); } -THRIFT_REGISTER_GENERATOR(perl, "Perl", ""); +THRIFT_REGISTER_GENERATOR(perl, "Perl", "") + diff --git a/compiler/cpp/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc index 04242c44..200d89a2 100644 --- a/compiler/cpp/src/generate/t_php_generator.cc +++ b/compiler/cpp/src/generate/t_php_generator.cc @@ -2303,4 +2303,5 @@ THRIFT_REGISTER_GENERATOR(php, "PHP", " autoload: Generate PHP with autoload\n" " oop: Generate PHP with object oriented subclasses\n" " rest: Generate PHP REST processors\n" -); +) + diff --git a/compiler/cpp/src/generate/t_py_generator.cc b/compiler/cpp/src/generate/t_py_generator.cc index 315cde24..bdd0c291 100644 --- a/compiler/cpp/src/generate/t_py_generator.cc +++ b/compiler/cpp/src/generate/t_py_generator.cc @@ -2379,4 +2379,5 @@ string t_py_generator::type_to_spec_args(t_type* ttype) { THRIFT_REGISTER_GENERATOR(py, "Python", " new_style: Generate new-style classes.\n" \ " twisted: Generate Twisted-friendly RPC services.\n" -); +) + diff --git a/compiler/cpp/src/generate/t_rb_generator.cc b/compiler/cpp/src/generate/t_rb_generator.cc index a7836c78..770f8e76 100644 --- a/compiler/cpp/src/generate/t_rb_generator.cc +++ b/compiler/cpp/src/generate/t_rb_generator.cc @@ -1183,4 +1183,5 @@ void t_rb_generator::generate_rb_union_validator(std::ofstream& out, indent(out) << "end" << endl << endl; } -THRIFT_REGISTER_GENERATOR(rb, "Ruby", ""); +THRIFT_REGISTER_GENERATOR(rb, "Ruby", "") + diff --git a/compiler/cpp/src/generate/t_st_generator.cc b/compiler/cpp/src/generate/t_st_generator.cc index 27b54490..fd8f035d 100644 --- a/compiler/cpp/src/generate/t_st_generator.cc +++ b/compiler/cpp/src/generate/t_st_generator.cc @@ -1051,4 +1051,5 @@ string t_st_generator::type_to_enum(t_type* type) { } -THRIFT_REGISTER_GENERATOR(st, "Smalltalk", ""); +THRIFT_REGISTER_GENERATOR(st, "Smalltalk", "") + diff --git a/compiler/cpp/src/generate/t_xsd_generator.cc b/compiler/cpp/src/generate/t_xsd_generator.cc index 729a91ae..c343b9a8 100644 --- a/compiler/cpp/src/generate/t_xsd_generator.cc +++ b/compiler/cpp/src/generate/t_xsd_generator.cc @@ -351,4 +351,5 @@ string t_xsd_generator::base_type_name(t_base_type::t_base tbase) { } } -THRIFT_REGISTER_GENERATOR(xsd, "XSD", ""); +THRIFT_REGISTER_GENERATOR(xsd, "XSD", "") + diff --git a/compiler/cpp/src/parse/t_field.h b/compiler/cpp/src/parse/t_field.h index fb58ca7c..0c3c2b1f 100644 --- a/compiler/cpp/src/parse/t_field.h +++ b/compiler/cpp/src/parse/t_field.h @@ -71,7 +71,7 @@ class t_field : public t_doc { enum e_req { T_REQUIRED, T_OPTIONAL, - T_OPT_IN_REQ_OUT, + T_OPT_IN_REQ_OUT }; void set_req(e_req req) { diff --git a/lib/cpp/src/concurrency/Mutex.h b/lib/cpp/src/concurrency/Mutex.h index 7cedbe3c..3ee5c6b8 100644 --- a/lib/cpp/src/concurrency/Mutex.h +++ b/lib/cpp/src/concurrency/Mutex.h @@ -133,7 +133,7 @@ class Guard { // as to whether we're doing acquireRead() or acquireWrite(). enum RWGuardType { RW_READ = 0, - RW_WRITE = 1, + RW_WRITE = 1 }; diff --git a/lib/cpp/src/protocol/TCompactProtocol.tcc b/lib/cpp/src/protocol/TCompactProtocol.tcc index 8ad999c2..ed9c281a 100644 --- a/lib/cpp/src/protocol/TCompactProtocol.tcc +++ b/lib/cpp/src/protocol/TCompactProtocol.tcc @@ -58,7 +58,7 @@ enum Types { CT_LIST = 0x09, CT_SET = 0x0A, CT_MAP = 0x0B, - CT_STRUCT = 0x0C, + CT_STRUCT = 0x0C }; const int8_t TTypeToCType[16] = { diff --git a/lib/cpp/src/server/TThreadPoolServer.cpp b/lib/cpp/src/server/TThreadPoolServer.cpp index 18319be7..840b8359 100644 --- a/lib/cpp/src/server/TThreadPoolServer.cpp +++ b/lib/cpp/src/server/TThreadPoolServer.cpp @@ -30,7 +30,7 @@ using boost::shared_ptr; using namespace std; using namespace apache::thrift; using namespace apache::thrift::concurrency; -using namespace apache::thrift::protocol;; +using namespace apache::thrift::protocol; using namespace apache::thrift::transport; class TThreadPoolServer::Task : public Runnable { diff --git a/lib/cpp/src/transport/TFileTransport.cpp b/lib/cpp/src/transport/TFileTransport.cpp index 704dc569..4b14dee7 100644 --- a/lib/cpp/src/transport/TFileTransport.cpp +++ b/lib/cpp/src/transport/TFileTransport.cpp @@ -421,8 +421,9 @@ void TFileTransport::writerThread() { offset_ = lseek(fd_, 0, SEEK_CUR); int32_t padding = (int32_t)((offset_ / chunkSize_ + 1) * chunkSize_ - offset_); - uint8_t zeros[padding]; - bzero(zeros, padding); + uint8_t* zeros = new uint8_t[padding]; + memset(zeros, '\0', padding); + boost::scoped_array array(zeros); if (-1 == ::write(fd_, zeros, padding)) { int errno_copy = errno; GlobalOutput.perror("TFileTransport: writerThread() error while padding zeros ", errno_copy); @@ -1004,7 +1005,7 @@ TFileProcessor::TFileProcessor(shared_ptr processor, inputProtocolFactory_(protocolFactory), outputProtocolFactory_(protocolFactory), inputTransport_(inputTransport), - outputTransport_(outputTransport) {}; + outputTransport_(outputTransport) {} void TFileProcessor::process(uint32_t numEvents, bool tail) { shared_ptr inputProtocol = inputProtocolFactory_->getProtocol(inputTransport_); diff --git a/lib/cpp/test/TBufferBaseTest.cpp b/lib/cpp/test/TBufferBaseTest.cpp index 21f47479..6e1bf163 100644 --- a/lib/cpp/test/TBufferBaseTest.cpp +++ b/lib/cpp/test/TBufferBaseTest.cpp @@ -172,7 +172,7 @@ void init_data() { } -BOOST_AUTO_TEST_SUITE( TBufferBaseTest ); +BOOST_AUTO_TEST_SUITE( TBufferBaseTest ) BOOST_AUTO_TEST_CASE( test_MemoryBuffer_Write_GetBuffer ) { init_data(); @@ -641,4 +641,5 @@ BOOST_AUTO_TEST_CASE( test_FramedTransport_Empty_Flush ) { BOOST_CHECK_EQUAL(buffer->getBufferAsString(), output2); } -BOOST_AUTO_TEST_SUITE_END(); +BOOST_AUTO_TEST_SUITE_END() + diff --git a/lib/cpp/test/TMemoryBufferTest.cpp b/lib/cpp/test/TMemoryBufferTest.cpp index 3dc19f88..3711970e 100644 --- a/lib/cpp/test/TMemoryBufferTest.cpp +++ b/lib/cpp/test/TMemoryBufferTest.cpp @@ -25,7 +25,7 @@ #include #include "gen-cpp/ThriftTest_types.h" -BOOST_AUTO_TEST_SUITE( TMemoryBufferTest ); +BOOST_AUTO_TEST_SUITE( TMemoryBufferTest ) BOOST_AUTO_TEST_CASE( test_roundtrip ) { using apache::thrift::transport::TMemoryBuffer; @@ -104,4 +104,5 @@ BOOST_AUTO_TEST_CASE( test_exceptions ) } } -BOOST_AUTO_TEST_SUITE_END(); +BOOST_AUTO_TEST_SUITE_END() + diff --git a/lib/cpp/test/TransportTest.cpp b/lib/cpp/test/TransportTest.cpp index dceb708d..59f2427a 100644 --- a/lib/cpp/test/TransportTest.cpp +++ b/lib/cpp/test/TransportTest.cpp @@ -360,8 +360,9 @@ void alarm_handler(int signum) { set_alarm(); // Write some data to the transport to hopefully unblock it. - uint8_t buf[info->writeLength]; + uint8_t* buf = new uint8_t[info->writeLength]; memset(buf, 'b', info->writeLength); + boost::scoped_array array(buf); info->transport->write(buf, info->writeLength); info->transport->flush(); @@ -895,7 +896,7 @@ class TransportTestGen { boost::unit_test::test_case* tc = boost::unit_test::make_test_case(test_func, name.str()); suite_->add(tc, expectedFailures); - }; + } template void addTestBlocking(const char* transportName, -- 2.17.1