You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/07/08 19:51:45 UTC
git commit: TS-2729: fix warnings from gcc
Repository: trafficserver
Updated Branches:
refs/heads/master b20bad15a -> 0c18f7bcd
TS-2729: fix warnings from gcc
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0c18f7bc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0c18f7bc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0c18f7bc
Branch: refs/heads/master
Commit: 0c18f7bcdc400500da8f1379c2fa8bbae9cf54c1
Parents: b20bad1
Author: James Peach <jp...@apache.org>
Authored: Tue Jul 8 10:51:27 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Jul 8 10:51:27 2014 -0700
----------------------------------------------------------------------
proxy/ProtocolProbeSessionAccept.cc | 2 +-
proxy/http2/Http2ClientSession.cc | 7 +++----
proxy/http2/Http2ClientSession.h | 2 +-
proxy/http2/Http2ConnectionState.cc | 2 +-
4 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c18f7bc/proxy/ProtocolProbeSessionAccept.cc
----------------------------------------------------------------------
diff --git a/proxy/ProtocolProbeSessionAccept.cc b/proxy/ProtocolProbeSessionAccept.cc
index 255da0c..dc36653 100644
--- a/proxy/ProtocolProbeSessionAccept.cc
+++ b/proxy/ProtocolProbeSessionAccept.cc
@@ -50,7 +50,7 @@ proto_is_http2(IOBufferReader * reader)
return false;
}
- ink_assert(nbytes <= HTTP2_CONNECTION_PREFACE_LEN);
+ ink_assert(nbytes <= (int64_t)HTTP2_CONNECTION_PREFACE_LEN);
return memcmp(HTTP2_CONNECTION_PREFACE, buf, nbytes) == 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c18f7bc/proxy/http2/Http2ClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ClientSession.cc b/proxy/http2/Http2ClientSession.cc
index 5628c0e..da329dc 100644
--- a/proxy/http2/Http2ClientSession.cc
+++ b/proxy/http2/Http2ClientSession.cc
@@ -79,7 +79,6 @@ void
Http2ClientSession::start()
{
VIO * read_vio;
- VIO * write_vio;
MUTEX_LOCK(lock, this->mutex, this_ethread());
@@ -87,7 +86,7 @@ Http2ClientSession::start()
HTTP2_SET_SESSION_HANDLER(&Http2ClientSession::state_read_connection_preface);
read_vio = this->do_io_read(this, INT64_MAX, this->read_buffer);
- write_vio = this->do_io_write(this, INT64_MAX, this->sm_writer);
+ this->do_io_write(this, INT64_MAX, this->sm_writer);
// 3.5 HTTP/2 Connection Preface. Upon establishment of a TCP connection and
// determination that HTTP/2 will be used by both peers, each endpoint MUST
@@ -205,7 +204,7 @@ Http2ClientSession::state_read_connection_preface(int event, void * edata)
STATE_ENTER(&Http2ClientSession::state_read_connection_preface, event);
ink_assert(event == VC_EVENT_READ_COMPLETE || event == VC_EVENT_READ_READY);
- if (this->sm_reader->read_avail() >= HTTP2_CONNECTION_PREFACE_LEN) {
+ if (this->sm_reader->read_avail() >= (int64_t)HTTP2_CONNECTION_PREFACE_LEN) {
char buf[HTTP2_CONNECTION_PREFACE_LEN];
unsigned nbytes;
@@ -247,7 +246,7 @@ Http2ClientSession::state_start_frame_read(int event, void * edata)
STATE_ENTER(&Http2ClientSession::state_start_frame_read, event);
ink_assert(event == VC_EVENT_READ_COMPLETE || event == VC_EVENT_READ_READY);
- if (this->sm_reader->read_avail() >= HTTP2_FRAME_HEADER_LEN) {
+ if (this->sm_reader->read_avail() >= (int64_t)HTTP2_FRAME_HEADER_LEN) {
uint8_t buf[HTTP2_FRAME_HEADER_LEN];
unsigned nbytes;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c18f7bc/proxy/http2/Http2ClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ClientSession.h b/proxy/http2/Http2ClientSession.h
index 9d1a13a..e9fea9f 100644
--- a/proxy/http2/Http2ClientSession.h
+++ b/proxy/http2/Http2ClientSession.h
@@ -81,7 +81,7 @@ public:
// Once the frame has been serialized, update the length.
void finalize(size_t nbytes) {
if (this->ioblock) {
- ink_assert(nbytes <= this->ioblock->write_avail());
+ ink_assert((int64_t)nbytes <= this->ioblock->write_avail());
this->ioblock->fill(nbytes);
this->hdr.cooked.length = this->ioblock->size() - HTTP2_FRAME_HEADER_LEN;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/0c18f7bc/proxy/http2/Http2ConnectionState.cc
----------------------------------------------------------------------
diff --git a/proxy/http2/Http2ConnectionState.cc b/proxy/http2/Http2ConnectionState.cc
index a1d2539..afbbceb 100644
--- a/proxy/http2/Http2ConnectionState.cc
+++ b/proxy/http2/Http2ConnectionState.cc
@@ -161,7 +161,7 @@ Http2ConnectionState::main_event_handler(int event, void * edata)
}
int
-Http2ConnectionState::state_closed(int event, void * edata)
+Http2ConnectionState::state_closed(int /* event */, void * /* edata */)
{
return 0;
}