Fix SkFILEStream.

Change-Id: I8c66e4e3e857227aed3d0bc497982f4c0d96d917
Reviewed-on: https://skia-review.googlesource.com/9498
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Leon Scroggins <scroggo@google.com>

1 files changed, 3 insertions, 47 deletions

diff --git a/src/ports/SkOSFile_stdio.cpp b/src/ports/SkOSFile_stdio.cpp
index 1c4bd4babd..68c2d3d4d7 100644
--- a/src/ports/SkOSFile_stdio.cpp
+++ b/src/ports/SkOSFile_stdio.cpp
@@ -87,15 +87,6 @@ FILE* sk_fopen(const char path[], SkFILE_Flags flags) {
     return file;
 }
 
-char* sk_fgets(char* str, int size, FILE* f) {
-    return fgets(str, size, (FILE *)f);
-}
-
-int sk_feof(FILE *f) {
-    // no :: namespace qualifier because it breaks android
-    return feof((FILE *)f);
-}
-
 size_t sk_fgetsize(FILE* f) {
     SkASSERT(f);
 
@@ -114,32 +105,6 @@ size_t sk_fgetsize(FILE* f) {
     return size;
 }
 
-bool sk_frewind(FILE* f) {
-    SkASSERT(f);
-    ::rewind(f);
-    return true;
-}
-
-size_t sk_fread(void* buffer, size_t byteCount, FILE* f) {
-    SkASSERT(f);
-    if (buffer == nullptr) {
-        size_t curr = ftell(f);
-        if ((long)curr == -1) {
-            SkDEBUGF(("sk_fread: ftell(%p) returned -1 feof:%d ferror:%d\n", f, feof(f), ferror(f)));
-            return 0;
-        }
-        int err = fseek(f, (long)byteCount, SEEK_CUR);
-        if (err != 0) {
-            SkDEBUGF(("sk_fread: fseek(%d) tell:%d failed with feof:%d ferror:%d returned:%d\n",
-                        byteCount, curr, feof(f), ferror(f), err));
-            return 0;
-        }
-        return byteCount;
-    }
-    else
-        return fread(buffer, 1, byteCount, f);
-}
-
 size_t sk_fwrite(const void* buffer, size_t byteCount, FILE* f) {
     SkASSERT(f);
     return fwrite(buffer, 1, byteCount, f);
@@ -158,16 +123,6 @@ void sk_fsync(FILE* f) {
 #endif
 }
 
-bool sk_fseek(FILE* f, size_t byteCount) {
-    int err = fseek(f, (long)byteCount, SEEK_SET);
-    return err == 0;
-}
-
-bool sk_fmove(FILE* f, long byteCount) {
-    int err = fseek(f, byteCount, SEEK_CUR);
-    return err == 0;
-}
-
 size_t sk_ftell(FILE* f) {
     long curr = ftell(f);
     if (curr < 0) {
@@ -177,8 +132,9 @@ size_t sk_ftell(FILE* f) {
 }
 
 void sk_fclose(FILE* f) {
-    SkASSERT(f);
-    fclose(f);
+    if (f) {
+        fclose(f);
+    }
 }
 
 bool sk_isdir(const char *path) {