summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 22:00:26 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 22:00:26 +0000
commit82809538ae7150d40c8e0edc9020915f46f6c974 (patch)
tree2b9cdc4be7417aab6697aed337167cafc30da20e /net
parente110b914ed2d8fdd7d4770215c4315a716a2a8c9 (diff)
downloadchromium_src-82809538ae7150d40c8e0edc9020915f46f6c974.zip
chromium_src-82809538ae7150d40c8e0edc9020915f46f6c974.tar.gz
chromium_src-82809538ae7150d40c8e0edc9020915f46f6c974.tar.bz2
Use size_t rather than uint32 in a few more places
to fixup some warnings. BUG=none TEST=none Review URL: http://codereview.chromium.org/274009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28747 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/flip/flip_framer.cc4
-rw-r--r--net/flip/flip_framer_test.cc4
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;
}
}