diff options
| author | arthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51> | 2011-07-27 00:52:05 +0000 |
|---|---|---|
| committer | arthurhsu@google.com <arthurhsu@google.com@672e30a5-4c29-85ac-ac6d-611c735e0a51> | 2011-07-27 00:52:05 +0000 |
| commit | 35a9bf28a889295528bfe46ab51902a460be5407 (patch) | |
| tree | 11afb4ccb8e4bbe4a7749f5d7175c62dcd05d256 | |
| parent | a669e0e4de0f658c4a36789886f86418d99c962e (diff) | |
| download | src-35a9bf28a889295528bfe46ab51902a460be5407.tar.gz | |
Fix compilation warnings when used by Chrome.
Make sure the warn unused return is not disabled.
git-svn-id: http://sfntly.googlecode.com/svn/trunk/cpp/src@28 672e30a5-4c29-85ac-ac6d-611c735e0a51
| -rw-r--r-- | sample/subsetter/subset_util.cc | 3 | ||||
| -rw-r--r-- | sfntly/port/file_input_stream.cc | 4 | ||||
| -rw-r--r-- | test/file_io_test.cc | 6 | ||||
| -rw-r--r-- | test/test_font_utils.cc | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/sample/subsetter/subset_util.cc b/sample/subsetter/subset_util.cc index 2266615..013a903 100644 --- a/sample/subsetter/subset_util.cc +++ b/sample/subsetter/subset_util.cc @@ -50,7 +50,8 @@ void SubsetUtil::subset(const char *input_file_path, size_t file_size = ftell(input_file); fseek(input_file, 0, SEEK_SET); input_buffer.resize(file_size); - fread(&(input_buffer[0]), 1, file_size, input_file); + size_t bytes_read = fread(&(input_buffer[0]), 1, file_size, input_file); + UNREFERENCED_PARAMETER(bytes_read); fclose(input_file); ByteArrayPtr ba = new MemoryByteArray(&(input_buffer[0]), file_size); diff --git a/sfntly/port/file_input_stream.cc b/sfntly/port/file_input_stream.cc index d4432bb..04a0fd6 100644 --- a/sfntly/port/file_input_stream.cc +++ b/sfntly/port/file_input_stream.cc @@ -88,8 +88,8 @@ int32_t FileInputStream::read() { #endif } byte_t value; - fread(&value, 1, 1, file_); - position_++; + size_t length = fread(&value, 1, 1, file_); + position_ += length; return value; } diff --git a/test/file_io_test.cc b/test/file_io_test.cc index 68ab4e5..1c02b0a 100644 --- a/test/file_io_test.cc +++ b/test/file_io_test.cc @@ -38,7 +38,8 @@ bool testFileInputStream() { fseek(file_handle, 0, SEEK_SET); ByteVector b1; b1.resize(length); - fread(&(b1[0]), 1, length, file_handle); + size_t bytes_read = fread(&(b1[0]), 1, length, file_handle); + EXPECT_EQ(bytes_read, length); fclose(file_handle); // Full file reading test @@ -98,7 +99,8 @@ bool testFontInputStreamBasic() { fseek(file_handle, 0, SEEK_SET); ByteVector b1; b1.resize(length); - fread(&(b1[0]), 1, length, file_handle); + size_t bytes_read = fread(&(b1[0]), 1, length, file_handle); + EXPECT_EQ(bytes_read, length); fclose(file_handle); FileInputStream is; diff --git a/test/test_font_utils.cc b/test/test_font_utils.cc index 8c3c55f..830f96e 100644 --- a/test/test_font_utils.cc +++ b/test/test_font_utils.cc @@ -63,7 +63,8 @@ void loadFile(const char* input_file_path, ByteVector* input_buffer) { size_t file_size = ftell(input_file); fseek(input_file, 0, SEEK_SET); input_buffer->resize(file_size); - fread(&((*input_buffer)[0]), 1, file_size, input_file); + size_t bytes_read = fread(&((*input_buffer)[0]), 1, file_size, input_file); + EXPECT_EQ(bytes_read, file_size); fclose(input_file); } |