aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkOSFile_stdio.cpp
diff options
context:
space:
mode:
authorGravatar vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-28 17:33:26 +0000
committerGravatar vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-03-28 17:33:26 +0000
commitfa1dd11f0e82fbcbcaabf7f3ccb3c556ac6d2ad0 (patch)
treebd4049f23c2402ee2563df026501158870552d5f /src/ports/SkOSFile_stdio.cpp
parentf0f562af5b35ad44f18ccf7e18becd1b1328eb0d (diff)
Revert r3523 and r2522
Review URL: https://codereview.appspot.com/5939051 git-svn-id: http://skia.googlecode.com/svn/trunk@3524 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkOSFile_stdio.cpp')
-rw-r--r--src/ports/SkOSFile_stdio.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/ports/SkOSFile_stdio.cpp b/src/ports/SkOSFile_stdio.cpp
index 1254394431..764b466878 100644
--- a/src/ports/SkOSFile_stdio.cpp
+++ b/src/ports/SkOSFile_stdio.cpp
@@ -36,16 +36,10 @@ size_t sk_fgetsize(SkFILE* f)
{
SkASSERT(f);
- long curr = ::ftell((FILE*)f); // remember where we are
- if (curr < 0) {
- return 0;
- }
+ size_t curr = ::ftell((FILE*)f); // remember where we are
::fseek((FILE*)f, 0, SEEK_END); // go to the end
- long size = ::ftell((FILE*)f); // record the size
- if (size < 0) {
- size = 0;
- }
- ::fseek((FILE*)f, curr, SEEK_SET); // go back to our prev loc
+ size_t size = ::ftell((FILE*)f); // record the size
+ ::fseek((FILE*)f, (long)curr, SEEK_SET); // go back to our prev loc
return size;
}