Updated Branches: refs/heads/master e0e64ba62 -> 086906ae3
Cleaning up build of atscppapi Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/086906ae Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/086906ae Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/086906ae Branch: refs/heads/master Commit: 086906ae3328a8c97b95ab3181376e7ab2e19074 Parents: e0e64ba Author: Brian Geffon <[email protected]> Authored: Tue Oct 29 15:03:34 2013 -0700 Committer: Brian Geffon <[email protected]> Committed: Tue Oct 29 15:03:34 2013 -0700 ---------------------------------------------------------------------- lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc | 2 +- lib/atscppapi/examples/async_http_fetch/Makefile.am | 2 +- lib/atscppapi/examples/async_timer/AsyncTimer.cc | 4 ++-- lib/atscppapi/examples/async_timer/Makefile.am | 2 +- lib/atscppapi/examples/clientredirect/ClientRedirect.cc | 2 +- lib/atscppapi/examples/clientredirect/Makefile.am | 2 +- lib/atscppapi/examples/clientrequest/ClientRequest.cc | 2 +- lib/atscppapi/examples/clientrequest/Makefile.am | 2 +- lib/atscppapi/examples/customresponse/CustomResponse.cc | 2 +- lib/atscppapi/examples/customresponse/Makefile.am | 2 +- lib/atscppapi/examples/data_caching/Makefile.am | 8 +++++++- lib/atscppapi/examples/data_caching/data_caching.cc | 4 ++-- lib/atscppapi/examples/detachedrequest/DetachedRequest.cc | 2 +- lib/atscppapi/examples/detachedrequest/Makefile.am | 2 +- lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc | 2 +- lib/atscppapi/examples/globalhook/Makefile.am | 2 +- .../examples/gzip_transformation/GzipTransformationPlugin.cc | 2 +- lib/atscppapi/examples/gzip_transformation/Makefile.am | 2 +- lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc | 2 +- lib/atscppapi/examples/helloworld/Makefile.am | 2 +- .../InternalTransactionHandling.cc | 4 ++-- .../examples/internal_transaction_handling/Makefile.am | 2 +- lib/atscppapi/examples/logger_example/LoggerExample.cc | 2 +- lib/atscppapi/examples/logger_example/Makefile.am | 2 +- .../examples/multiple_transaction_hooks/Makefile.am | 2 +- .../MultipleTransactionHookPlugins.cc | 2 +- .../examples/null_transformation_plugin/Makefile.am | 2 +- .../null_transformation_plugin/NullTransformationPlugin.cc | 2 +- lib/atscppapi/examples/post_buffer/Makefile.am | 2 +- lib/atscppapi/examples/post_buffer/PostBuffer.cc | 2 +- lib/atscppapi/examples/remap_plugin/Makefile.am | 2 +- lib/atscppapi/examples/remap_plugin/RemapPlugin.cc | 2 +- lib/atscppapi/examples/request_cookies/Makefile.am | 2 +- lib/atscppapi/examples/request_cookies/RequestCookies.cc | 2 +- lib/atscppapi/examples/serverresponse/Makefile.am | 2 +- lib/atscppapi/examples/serverresponse/ServerResponse.cc | 2 +- lib/atscppapi/examples/stat_example/Makefile.am | 2 +- lib/atscppapi/examples/stat_example/StatExample.cc | 4 ++-- lib/atscppapi/examples/timeout_example/Makefile.am | 2 +- .../examples/timeout_example/TimeoutExamplePlugin.cc | 2 +- lib/atscppapi/examples/transactionhook/Makefile.am | 2 +- .../examples/transactionhook/TransactionHookPlugin.cc | 2 +- lib/atscppapi/src/Headers.cc | 1 + lib/atscppapi/src/include/atscppapi/AsyncTimer.h | 2 +- lib/atscppapi/src/include/atscppapi/PluginInit.h | 2 ++ lib/atscppapi/src/include/atscppapi/RemapPlugin.h | 5 +++-- lib/atscppapi/src/include/atscppapi/utils.h | 4 ++++ 47 files changed, 63 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc index c98e658..d8bce6b 100644 --- a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc +++ b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc @@ -137,7 +137,7 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "Loaded async_http_fetch_example plugin"); GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/async_http_fetch/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/async_http_fetch/Makefile.am b/lib/atscppapi/examples/async_http_fetch/Makefile.am index 8dbb281..dd79227 100644 --- a/lib/atscppapi/examples/async_http_fetch/Makefile.am +++ b/lib/atscppapi/examples/async_http_fetch/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=AsyncHttpFetch.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/async_timer/AsyncTimer.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/async_timer/AsyncTimer.cc b/lib/atscppapi/examples/async_timer/AsyncTimer.cc index 296d815..738a536 100644 --- a/lib/atscppapi/examples/async_timer/AsyncTimer.cc +++ b/lib/atscppapi/examples/async_timer/AsyncTimer.cc @@ -34,7 +34,7 @@ public: Async::execute<AsyncTimer>(this, timer_, shared_ptr<Mutex>()); // letting the system create the mutex } - void handleAsyncComplete(AsyncTimer &timer) { + void handleAsyncComplete(AsyncTimer &timer ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "Got timer event in object %p!", this); if ((type_ == AsyncTimer::TYPE_ONE_OFF) || (max_instances_ && (++instance_count_ == max_instances_))) { TS_DEBUG(TAG, "Stopping timer in object %p!", this); @@ -53,7 +53,7 @@ private: AsyncTimer *timer_; }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { int period_in_ms = 1000; TimerEventReceiver *timer1 = new TimerEventReceiver(AsyncTimer::TYPE_PERIODIC, period_in_ms); TS_DEBUG(TAG, "Created periodic timer %p with initial period 0, regular period %d and max instances 0", timer1, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/async_timer/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/async_timer/Makefile.am b/lib/atscppapi/examples/async_timer/Makefile.am index 1a48970..363e93a 100644 --- a/lib/atscppapi/examples/async_timer/Makefile.am +++ b/lib/atscppapi/examples/async_timer/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=AsyncTimer.so pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = AsyncTimer.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/clientredirect/ClientRedirect.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/clientredirect/ClientRedirect.cc b/lib/atscppapi/examples/clientredirect/ClientRedirect.cc index 1da6533..39cbc5f 100644 --- a/lib/atscppapi/examples/clientredirect/ClientRedirect.cc +++ b/lib/atscppapi/examples/clientredirect/ClientRedirect.cc @@ -71,6 +71,6 @@ public: }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new ClientRedirectGlobalPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/clientredirect/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/clientredirect/Makefile.am b/lib/atscppapi/examples/clientredirect/Makefile.am index dde30ef..6c68195 100644 --- a/lib/atscppapi/examples/clientredirect/Makefile.am +++ b/lib/atscppapi/examples/clientredirect/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=ClientRedirect.so pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = ClientRedirect.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/clientrequest/ClientRequest.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/clientrequest/ClientRequest.cc b/lib/atscppapi/examples/clientrequest/ClientRequest.cc index b143374..9c225a8 100644 --- a/lib/atscppapi/examples/clientrequest/ClientRequest.cc +++ b/lib/atscppapi/examples/clientrequest/ClientRequest.cc @@ -128,6 +128,6 @@ public: }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/clientrequest/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/clientrequest/Makefile.am b/lib/atscppapi/examples/clientrequest/Makefile.am index 2c69b0c..452c1c0 100644 --- a/lib/atscppapi/examples/clientrequest/Makefile.am +++ b/lib/atscppapi/examples/clientrequest/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=ClientRequest.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/customresponse/CustomResponse.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/customresponse/CustomResponse.cc b/lib/atscppapi/examples/customresponse/CustomResponse.cc index 870a838..7327081 100644 --- a/lib/atscppapi/examples/customresponse/CustomResponse.cc +++ b/lib/atscppapi/examples/customresponse/CustomResponse.cc @@ -77,6 +77,6 @@ public: }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new ClientRedirectGlobalPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/customresponse/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/customresponse/Makefile.am b/lib/atscppapi/examples/customresponse/Makefile.am index 8a242a6..5b850fd 100644 --- a/lib/atscppapi/examples/customresponse/Makefile.am +++ b/lib/atscppapi/examples/customresponse/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=CustomResponse.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/data_caching/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/data_caching/Makefile.am b/lib/atscppapi/examples/data_caching/Makefile.am index 8272e03..e2e83e8 100644 --- a/lib/atscppapi/examples/data_caching/Makefile.am +++ b/lib/atscppapi/examples/data_caching/Makefile.am @@ -14,7 +14,13 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_builddir)/proxy/api \ + -I$(top_srcdir)/proxy/api \ + -I$(top_builddir)/lib/ts \ + -I$(top_srcdir)/lib/ts \ + -I$(top_srcdir)/lib/atscppapi/src/include \ + -Wno-unused-variable + target=data_caching.so pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = data_caching.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/data_caching/data_caching.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/data_caching/data_caching.cc b/lib/atscppapi/examples/data_caching/data_caching.cc index 64ae4ee..d614ded 100644 --- a/lib/atscppapi/examples/data_caching/data_caching.cc +++ b/lib/atscppapi/examples/data_caching/data_caching.cc @@ -65,7 +65,7 @@ private: namespace { -int handlePostRemap(TSCont cont, TSEvent event, void *edata) { +int handlePostRemap(TSCont cont ATSCPPAPI_UNUSED, TSEvent event ATSCPPAPI_UNUSED, void *edata) { TSHttpTxn txn = static_cast<TSHttpTxn>(edata); TSMBuffer hdr_buf; TSMLoc hdr_loc, field_loc; @@ -86,7 +86,7 @@ int handlePostRemap(TSCont cont, TSEvent event, void *edata) { } -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { int do_overwrite = 1; setenv(utils::DISABLE_DATA_CACHING_ENV_FLAG.c_str(), "true", do_overwrite); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/detachedrequest/DetachedRequest.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/detachedrequest/DetachedRequest.cc b/lib/atscppapi/examples/detachedrequest/DetachedRequest.cc index ee95118..f84e1e7 100644 --- a/lib/atscppapi/examples/detachedrequest/DetachedRequest.cc +++ b/lib/atscppapi/examples/detachedrequest/DetachedRequest.cc @@ -64,6 +64,6 @@ private: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/detachedrequest/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/detachedrequest/Makefile.am b/lib/atscppapi/examples/detachedrequest/Makefile.am index dfda99d..4d74d41 100644 --- a/lib/atscppapi/examples/detachedrequest/Makefile.am +++ b/lib/atscppapi/examples/detachedrequest/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=DetachedRequest.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc b/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc index 629c2e6..f437ed8 100644 --- a/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc +++ b/lib/atscppapi/examples/globalhook/GlobalHookPlugin.cc @@ -34,7 +34,7 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/globalhook/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/globalhook/Makefile.am b/lib/atscppapi/examples/globalhook/Makefile.am index 71ba649..a9b301a 100644 --- a/lib/atscppapi/examples/globalhook/Makefile.am +++ b/lib/atscppapi/examples/globalhook/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=GlobalHookPlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc b/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc index 176870f..b17b4b2 100644 --- a/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc +++ b/lib/atscppapi/examples/gzip_transformation/GzipTransformationPlugin.cc @@ -164,7 +164,7 @@ public: }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "TSPluginInit"); GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/gzip_transformation/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/gzip_transformation/Makefile.am b/lib/atscppapi/examples/gzip_transformation/Makefile.am index 655c867..98dd8cd 100644 --- a/lib/atscppapi/examples/gzip_transformation/Makefile.am +++ b/lib/atscppapi/examples/gzip_transformation/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=GzipTransformationPlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc b/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc index 6c73cda..f5045a9 100644 --- a/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc +++ b/lib/atscppapi/examples/helloworld/HelloWorldPlugin.cc @@ -28,7 +28,7 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { std::cout << "Hello from " << argv[0] << std::endl; atscppapi::GlobalPlugin *instance = new HelloWorldPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/helloworld/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/helloworld/Makefile.am b/lib/atscppapi/examples/helloworld/Makefile.am index 615f3eb..9bb13df 100644 --- a/lib/atscppapi/examples/helloworld/Makefile.am +++ b/lib/atscppapi/examples/helloworld/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=HelloWorldPlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc b/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc index 566acce..642102c 100644 --- a/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc +++ b/lib/atscppapi/examples/internal_transaction_handling/InternalTransactionHandling.cc @@ -54,11 +54,11 @@ public: transaction.resume(); } - void handleAsyncComplete(AsyncHttpFetch &provider) { + void handleAsyncComplete(AsyncHttpFetch &provider ATSCPPAPI_UNUSED) { } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "Loaded async_http_fetch_example plugin"); AllTransactionsGlobalPlugin *instance1 = new AllTransactionsGlobalPlugin(); NoInternalTransactionsGlobalPlugin *instance2 = new NoInternalTransactionsGlobalPlugin(); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/internal_transaction_handling/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am index 9035fff..a521c21 100644 --- a/lib/atscppapi/examples/internal_transaction_handling/Makefile.am +++ b/lib/atscppapi/examples/internal_transaction_handling/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=InternalTransactionHandling.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/logger_example/LoggerExample.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/logger_example/LoggerExample.cc b/lib/atscppapi/examples/logger_example/LoggerExample.cc index 4538c41..3832e09 100644 --- a/lib/atscppapi/examples/logger_example/LoggerExample.cc +++ b/lib/atscppapi/examples/logger_example/LoggerExample.cc @@ -94,7 +94,7 @@ private: char big_buffer_14kb_[14*1024]; }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { // Create a new logger // This will create a log file with the name logger_example.log (since we left off // the extension it will automatically add .log) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/logger_example/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/logger_example/Makefile.am b/lib/atscppapi/examples/logger_example/Makefile.am index 9b88ed2..892b57f 100644 --- a/lib/atscppapi/examples/logger_example/Makefile.am +++ b/lib/atscppapi/examples/logger_example/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=LoggerExample.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am index 76f9a66..5ff7df4 100644 --- a/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am +++ b/lib/atscppapi/examples/multiple_transaction_hooks/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=MultipleTransactionHookPlugins.so pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = MultipleTransactionHookPlugins.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc b/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc index ce9db4d..a1c4240 100644 --- a/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc +++ b/lib/atscppapi/examples/multiple_transaction_hooks/MultipleTransactionHookPlugins.cc @@ -95,6 +95,6 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { atscppapi::GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/null_transformation_plugin/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am index b82f525..7c196da 100644 --- a/lib/atscppapi/examples/null_transformation_plugin/Makefile.am +++ b/lib/atscppapi/examples/null_transformation_plugin/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=NullTransformationPlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc index c23971e..8da1eb8 100644 --- a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc +++ b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc @@ -71,7 +71,7 @@ public: }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "TSPluginInit"); GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/post_buffer/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/post_buffer/Makefile.am b/lib/atscppapi/examples/post_buffer/Makefile.am index fcf20e7..6829ad3 100644 --- a/lib/atscppapi/examples/post_buffer/Makefile.am +++ b/lib/atscppapi/examples/post_buffer/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=PostBuffer.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/post_buffer/PostBuffer.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/post_buffer/PostBuffer.cc b/lib/atscppapi/examples/post_buffer/PostBuffer.cc index 2c3f132..8fa51ca 100644 --- a/lib/atscppapi/examples/post_buffer/PostBuffer.cc +++ b/lib/atscppapi/examples/post_buffer/PostBuffer.cc @@ -69,7 +69,7 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/remap_plugin/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/remap_plugin/Makefile.am b/lib/atscppapi/examples/remap_plugin/Makefile.am index cec18e5..ec166a4 100644 --- a/lib/atscppapi/examples/remap_plugin/Makefile.am +++ b/lib/atscppapi/examples/remap_plugin/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=RemapPlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc index 8e06cec..50fa993 100644 --- a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc +++ b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc @@ -80,7 +80,7 @@ public: } }; -TsReturnCode TSRemapNewInstance(int argc, char *argv[], void **instance_handle, char *errbuf, int errbuf_size) { +TsReturnCode TSRemapNewInstance(int argc ATSCPPAPI_UNUSED, char *argv[] ATSCPPAPI_UNUSED, void **instance_handle, char *errbuf ATSCPPAPI_UNUSED, int errbuf_size ATSCPPAPI_UNUSED) { MyRemapPlugin *new_remap_plugin = new MyRemapPlugin(instance_handle); return TS_SUCCESS; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/request_cookies/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/request_cookies/Makefile.am b/lib/atscppapi/examples/request_cookies/Makefile.am index 03c8040..b5ed89a 100644 --- a/lib/atscppapi/examples/request_cookies/Makefile.am +++ b/lib/atscppapi/examples/request_cookies/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable -Wno-unused-parameter target=RequestCookies.so pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = RequestCookies.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/request_cookies/RequestCookies.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/request_cookies/RequestCookies.cc b/lib/atscppapi/examples/request_cookies/RequestCookies.cc index ebdfdc1..b0ee85d 100644 --- a/lib/atscppapi/examples/request_cookies/RequestCookies.cc +++ b/lib/atscppapi/examples/request_cookies/RequestCookies.cc @@ -62,6 +62,6 @@ private: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { new MyGlobalPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/serverresponse/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/serverresponse/Makefile.am b/lib/atscppapi/examples/serverresponse/Makefile.am index 014a65e..56cab1e 100644 --- a/lib/atscppapi/examples/serverresponse/Makefile.am +++ b/lib/atscppapi/examples/serverresponse/Makefile.am @@ -14,7 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=ServerResponse.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/serverresponse/ServerResponse.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/serverresponse/ServerResponse.cc b/lib/atscppapi/examples/serverresponse/ServerResponse.cc index d1b7a69..75b1e28 100644 --- a/lib/atscppapi/examples/serverresponse/ServerResponse.cc +++ b/lib/atscppapi/examples/serverresponse/ServerResponse.cc @@ -100,6 +100,6 @@ private: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { GlobalPlugin *instance = new ServerResponsePlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/stat_example/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/stat_example/Makefile.am b/lib/atscppapi/examples/stat_example/Makefile.am index 29b7caf..6e95a5e 100644 --- a/lib/atscppapi/examples/stat_example/Makefile.am +++ b/lib/atscppapi/examples/stat_example/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=StatExample.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/stat_example/StatExample.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/stat_example/StatExample.cc b/lib/atscppapi/examples/stat_example/StatExample.cc index 49e91a7..1b3b562 100644 --- a/lib/atscppapi/examples/stat_example/StatExample.cc +++ b/lib/atscppapi/examples/stat_example/StatExample.cc @@ -54,12 +54,12 @@ public: virtual void handleReadRequestHeadersPostRemap(Transaction &transaction) { TS_DEBUG(TAG, "Received a request, incrementing the counter."); stat.increment(); - TS_DEBUG(TAG, "Stat '%s' value = %lld", STAT_NAME.c_str(), stat.get()); + TS_DEBUG(TAG, "Stat '%s' value = %ld", STAT_NAME.c_str(), stat.get()); transaction.resume(); } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "Loaded stat_example plugin"); // Since this stat is not persistent it will be initialized to 0. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/timeout_example/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/timeout_example/Makefile.am b/lib/atscppapi/examples/timeout_example/Makefile.am index 94d6e7b..2c8ae05 100644 --- a/lib/atscppapi/examples/timeout_example/Makefile.am +++ b/lib/atscppapi/examples/timeout_example/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=TimeoutExamplePlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc b/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc index fb2fe83..2cbfadb 100644 --- a/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc +++ b/lib/atscppapi/examples/timeout_example/TimeoutExamplePlugin.cc @@ -48,7 +48,7 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { TS_DEBUG(TAG, "TSPluginInit"); GlobalPlugin *instance = new TimeoutExamplePlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/transactionhook/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/transactionhook/Makefile.am b/lib/atscppapi/examples/transactionhook/Makefile.am index c604875..08f2406 100644 --- a/lib/atscppapi/examples/transactionhook/Makefile.am +++ b/lib/atscppapi/examples/transactionhook/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include +AM_CPPFLAGS = -I$(top_srcdir)/lib/atscppapi/src/include -Wno-unused-variable target=TransactionHookPlugin.so pkglibdir = ${pkglibexecdir} http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc b/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc index b84f300..a514532 100644 --- a/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc +++ b/lib/atscppapi/examples/transactionhook/TransactionHookPlugin.cc @@ -55,6 +55,6 @@ public: } }; -void TSPluginInit(int argc, const char *argv[]) { +void TSPluginInit(int argc ATSCPPAPI_UNUSED, const char *argv[] ATSCPPAPI_UNUSED) { atscppapi::GlobalPlugin *instance = new GlobalHookPlugin(); } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/src/Headers.cc ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/Headers.cc b/lib/atscppapi/src/Headers.cc index 0c07923..cad277e 100644 --- a/lib/atscppapi/src/Headers.cc +++ b/lib/atscppapi/src/Headers.cc @@ -120,6 +120,7 @@ bool Headers::checkAndInitHeaders() const { state_->hdr_loc_); return false; } + state_->name_values_map_.getValueRef().clear(); string key; const char *name; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/src/include/atscppapi/AsyncTimer.h ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/include/atscppapi/AsyncTimer.h b/lib/atscppapi/src/include/atscppapi/AsyncTimer.h index d0a756d..10da3e9 100644 --- a/lib/atscppapi/src/include/atscppapi/AsyncTimer.h +++ b/lib/atscppapi/src/include/atscppapi/AsyncTimer.h @@ -62,7 +62,7 @@ public: */ AsyncTimer(Type type, int period_in_ms, int initial_period_in_ms = 0); - ~AsyncTimer(); + virtual ~AsyncTimer(); /** * Starts the timer. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/src/include/atscppapi/PluginInit.h ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/include/atscppapi/PluginInit.h b/lib/atscppapi/src/include/atscppapi/PluginInit.h index ecd72e4..ffa2f91 100644 --- a/lib/atscppapi/src/include/atscppapi/PluginInit.h +++ b/lib/atscppapi/src/include/atscppapi/PluginInit.h @@ -24,6 +24,8 @@ #ifndef ATSCPPAPI_PLUGININIT_H_ #define ATSCPPAPI_PLUGININIT_H_ +#include <atscppapi/utils.h> + extern "C" { /** http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/src/include/atscppapi/RemapPlugin.h ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/include/atscppapi/RemapPlugin.h b/lib/atscppapi/src/include/atscppapi/RemapPlugin.h index 2a80291..2f33143 100644 --- a/lib/atscppapi/src/include/atscppapi/RemapPlugin.h +++ b/lib/atscppapi/src/include/atscppapi/RemapPlugin.h @@ -26,6 +26,7 @@ #include "atscppapi/Transaction.h" #include "atscppapi/Url.h" +#include "atscppapi/utils.h" namespace atscppapi { @@ -56,8 +57,8 @@ public: * * @return Result of the remap - will dictate futher processing by the system. */ - virtual Result doRemap(const Url &map_from_url, const Url &map_to_url, Transaction &transaction, - bool &redirect) { + virtual Result doRemap(const Url &map_from_url ATSCPPAPI_UNUSED, const Url &map_to_url ATSCPPAPI_UNUSED, Transaction &transaction ATSCPPAPI_UNUSED, + bool &redirect ATSCPPAPI_UNUSED) { return RESULT_NO_REMAP; } http://git-wip-us.apache.org/repos/asf/trafficserver/blob/086906ae/lib/atscppapi/src/include/atscppapi/utils.h ---------------------------------------------------------------------- diff --git a/lib/atscppapi/src/include/atscppapi/utils.h b/lib/atscppapi/src/include/atscppapi/utils.h index 85b8c9e..997c1d1 100644 --- a/lib/atscppapi/src/include/atscppapi/utils.h +++ b/lib/atscppapi/src/include/atscppapi/utils.h @@ -30,6 +30,10 @@ #include <arpa/inet.h> #include <stdint.h> +#ifndef ATSCPPAPI_UNUSED +#define ATSCPPAPI_UNUSED __attribute__ ((unused)) +#endif + namespace atscppapi { namespace utils {
