Eliminate SkFILE - it always is the same as FILE.

include/core/SkOSFile.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 // TODO: add unittests for all these operations
 
 #ifndef SkOSFile_DEFINED
 #define SkOSFile_DEFINED
 
+#include <stdio.h>
+
 #include "SkString.h"
 
-struct SkFILE;
-
 enum SkFILE_Flags {
     kRead_SkFILE_Flag   = 0x01,
     kWrite_SkFILE_Flag  = 0x02
 };
 
 #ifdef _WIN32
 const static char SkPATH_SEPARATOR = '\\';
 #else
 const static char SkPATH_SEPARATOR = '/';
 #endif
 
-SkFILE* sk_fopen(const char path[], SkFILE_Flags);
-void    sk_fclose(SkFILE*);
+FILE* sk_fopen(const char path[], SkFILE_Flags);
+void    sk_fclose(FILE*);
 
-size_t  sk_fgetsize(SkFILE*);
+size_t  sk_fgetsize(FILE*);
 /** Return true if the file could seek back to the beginning
 */
-bool    sk_frewind(SkFILE*);
+bool    sk_frewind(FILE*);
 
-size_t  sk_fread(void* buffer, size_t byteCount, SkFILE*);
-size_t  sk_fwrite(const void* buffer, size_t byteCount, SkFILE*);
+size_t  sk_fread(void* buffer, size_t byteCount, FILE*);
+size_t  sk_fwrite(const void* buffer, size_t byteCount, FILE*);
 
-char*   sk_fgets(char* str, int size, SkFILE* f);
+char*   sk_fgets(char* str, int size, FILE* f);
 
-void    sk_fflush(SkFILE*);
+void    sk_fflush(FILE*);
 
-bool    sk_fseek(SkFILE*, size_t);
-bool    sk_fmove(SkFILE*, long);
-size_t  sk_ftell(SkFILE*);
+bool    sk_fseek(FILE*, size_t);
+bool    sk_fmove(FILE*, long);
+size_t  sk_ftell(FILE*);
 
 /** Maps a file into memory. Returns the address and length on success, NULL otherwise.
  *  The mapping is read only.
  *  When finished with the mapping, free the returned pointer with sk_fmunmap.
  */
-void*   sk_fmmap(SkFILE* f, size_t* length);
+void*   sk_fmmap(FILE* f, size_t* length);
 
 /** Maps a file descriptor into memory. Returns the address and length on success, NULL otherwise.
  *  The mapping is read only.
  *  When finished with the mapping, free the returned pointer with sk_fmunmap.
  */
 void*   sk_fdmmap(int fd, size_t* length);
 
 /** Unmaps a file previously mapped by sk_fmmap or sk_fdmmap.
  *  The length parameter must be the same as returned from sk_fmmap.
  */
 void    sk_fmunmap(const void* addr, size_t length);
 
 /** Returns true if the two point at the exact same filesystem object. */
-bool    sk_fidentical(SkFILE* a, SkFILE* b);
+bool    sk_fidentical(FILE* a, FILE* b);
 
 /** Returns the underlying file descriptor for the given file.
  *  The return value will be < 0 on failure.
  */
-int     sk_fileno(SkFILE* f);
+int     sk_fileno(FILE* f);
 
 /** Returns true if something (file, directory, ???) exists at this path,
  *  and has the specified access flags.
  */
 bool    sk_exists(const char *path, SkFILE_Flags = (SkFILE_Flags)0);
 
 // Returns true if a directory exists at this path.
 bool    sk_isdir(const char *path);
 
 // Have we reached the end of the file?
-int sk_feof(SkFILE *);
+int sk_feof(FILE *);
 
 
 // Create a new directory at this path; returns true if successful.
 // If the directory already existed, this will return true.
 // Description of the error, if any, will be written to stderr.
 bool    sk_mkdir(const char* path);
 
 class SkOSFile {
 public:
     class Iter {
@@ skipping 45 matching lines @@
      *  Behaves like python's os.path.dirname. If the fullPath is
      *  /dir/subdir/ the return will be /dir/subdir/
      *  @param fullPath Full path to the file.
      *  @return SkString The dir containing the file - anything preceding the
      *      final slash, or the full name if ending in a slash.
      */
     static SkString Dirname(const char* fullPath);
 };
 
 #endif