diff options
| -rw-r--r-- | net/flip/flip_framer.cc | 4 | ||||
| -rw-r--r-- | net/flip/flip_framer_test.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/flip/flip_framer.cc b/net/flip/flip_framer.cc index 393331e..9793c3b 100644 --- a/net/flip/flip_framer.cc +++ b/net/flip/flip_framer.cc @@ -249,7 +249,7 @@ size_t FlipFramer::ProcessInput(const char* data, size_t len) { if (!InitializeDecompressor()) return NULL; - int decompressed_max_size = amount_to_forward * 100; + size_t decompressed_max_size = amount_to_forward * 100; scoped_array<char> decompressed(new char[decompressed_max_size]); decompressor_->next_in = reinterpret_cast<Bytef*>( const_cast<char*>(data)); @@ -263,7 +263,7 @@ size_t FlipFramer::ProcessInput(const char* data, size_t len) { set_error(FLIP_DECOMPRESS_FAILURE); goto bottom; } - int decompressed_size = decompressed_max_size - + size_t decompressed_size = decompressed_max_size - decompressor_->avail_out; visitor_->OnStreamFrameData(current_data_frame->stream_id(), decompressed.get(), diff --git a/net/flip/flip_framer_test.cc b/net/flip/flip_framer_test.cc index 847b83f..f0ca835 100644 --- a/net/flip/flip_framer_test.cc +++ b/net/flip/flip_framer_test.cc @@ -33,12 +33,12 @@ class TestFlipVisitor : public FlipFramerVisitorInterface { } void OnStreamFrameData(FlipStreamId stream_id, const char* data, - uint32 len) { + size_t len) { data_frame_count_++; #ifdef TEST_LOGGING std::cerr << "OnStreamFrameData(" << stream_id << ", \""; if (len > 0) { - for (uint32 i = 0 ; i < len; ++i) { + for (size_t i = 0 ; i < len; ++i) { std::cerr << std::hex << (0xFF & (unsigned int)data[i]) << std::dec; } } |