Repository: trafficserver Updated Branches: refs/heads/master 3eec3878c -> f68e950f3
Revert "TS-3885: Clang format" This reverts commit 9cb0b497b5bd5e209d728a0aaca22d6c6a7ed7a3. These commits breaks CI in that the regressions can segfault. See TS-3926 for details. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ddadf76d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ddadf76d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ddadf76d Branch: refs/heads/master Commit: ddadf76dab5da54e6c42973e4a21b380b683dce4 Parents: 3eec387 Author: Leif Hedstrom <[email protected]> Authored: Tue Sep 22 16:46:42 2015 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Sep 22 16:46:42 2015 -0600 ---------------------------------------------------------------------- proxy/InkAPITest.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ddadf76d/proxy/InkAPITest.cc ---------------------------------------------------------------------- diff --git a/proxy/InkAPITest.cc b/proxy/InkAPITest.cc index fae5f9e..6cc2ab9 100644 --- a/proxy/InkAPITest.cc +++ b/proxy/InkAPITest.cc @@ -251,8 +251,7 @@ REGRESSION_TEST(SDK_API_TSConfig)(RegressionTest *test, int /* atype ATS_UNUSED ////////////////////////////////////////////// struct SDK_NetVConn_Params { - SDK_NetVConn_Params(const char *_a, RegressionTest *_t, int *_p) - : buffer(NULL), api(_a), port(0), test(_t), pstatus(_p), server_vc(NULL), client_vc(NULL) + SDK_NetVConn_Params(const char *_a, RegressionTest *_t, int *_p) : buffer(NULL), api(_a), port(0), test(_t), pstatus(_p), server_vc(NULL), client_vc(NULL) { this->status.client = this->status.server = REGRESSION_TEST_INPROGRESS; } @@ -373,8 +372,9 @@ client_handler(TSCont contp, TSEvent event, void *data) char *ptr_block = TSIOBufferBlockWriteStart(block, &avail); if (avail <= 0) { - SDK_RPRINT(params->test, params->api, "TSIOBufferBlockWriteStart", TC_FAIL, "No space available to write in buffer, " - "expected %lldd", + SDK_RPRINT(params->test, params->api, "TSIOBufferBlockWriteStart", + TC_FAIL, "No space available to write in buffer, " + "expected %lldd", avail); TSContDestroy(contp); return 1; @@ -385,12 +385,15 @@ client_handler(TSCont contp, TSEvent event, void *data) params->vio = TSVConnWrite((TSVConn)(data), contp, readerp, 1); return 0; - } else if (event == TS_EVENT_VCONN_WRITE_COMPLETE) { + } + else if (event == TS_EVENT_VCONN_WRITE_COMPLETE) { TSVConnShutdown((TSVConn)params->client_vc, 0, 1); TSContDestroy(contp); return 0; - } else { - SDK_RPRINT(params->test, params->api, "ClientConnect", TC_FAIL, "received unexpected event %d", event); + } + else { + SDK_RPRINT(params->test, params->api, "ClientConnect", TC_FAIL, + "received unexpected event %d", event); } TSContDestroy(contp);
