diff options
| author | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 00:34:44 +0000 |
|---|---|---|
| committer | maf@chromium.org <maf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-06 00:34:44 +0000 |
| commit | de4817b40830c7d3af8c63e1f5ae14dde042fed0 (patch) | |
| tree | b80166553c03e360613a122c56b919187fe2bece /o3d/import | |
| parent | a14e56a9987689db99734d808768ed3be6a182da (diff) | |
| download | chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.zip chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.gz chromium_src-de4817b40830c7d3af8c63e1f5ae14dde042fed0.tar.bz2 | |
Deleting trailing spaces, add ending newline where missing to make lint happy. Also delete some commented out CSS, etc.
Review URL: http://codereview.chromium.org/3083012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/archive_processor.cc | 2 | ||||
| -rw-r--r-- | o3d/import/cross/archive_request.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/o3d/import/cross/archive_processor.cc b/o3d/import/cross/archive_processor.cc index 674579f..47b3d35 100644 --- a/o3d/import/cross/archive_processor.cc +++ b/o3d/import/cross/archive_processor.cc @@ -75,7 +75,7 @@ StreamProcessor::Status ArchiveProcessor::ProcessFile(const char *filename) { // progressive streaming system FILE *fp = fopen(filename, "rb"); if (!fp) return FAILURE; // can't open file! - if (static_cast<size_t>(file_length) != + if (static_cast<size_t>(file_length) != fread(p, sizeof(uint8), file_length, fp)) return FAILURE; if (0 != fclose(fp)) return FAILURE; diff --git a/o3d/import/cross/archive_request.cc b/o3d/import/cross/archive_request.cc index 4c6a42e..3de246a 100644 --- a/o3d/import/cross/archive_request.cc +++ b/o3d/import/cross/archive_request.cc @@ -169,7 +169,7 @@ void ArchiveRequest::ReceiveFileHeader(const ArchiveFileInfo &file_info) { bool ArchiveRequest::ReceiveFileData(MemoryReadStream *input_stream, size_t nbytes) { // hold on to ourselves in case we are freed in the callback. - ArchiveRequest::Ref temp(this); + ArchiveRequest::Ref temp(this); assert(input_stream->GetRemainingByteCount() >= nbytes); assert(file_memory_stream_.GetRemainingByteCount() >= nbytes); |