Bug 1248228 - Build fix for SkOSFile_stdio on OpenBSD. r=jmuizelaar
authorLee Salzman <lsalzman@mozilla.com>
Tue, 16 Feb 2016 11:33:31 -0500
changeset 331595 8a2d680cecc382a2b03bcc6640bcfcdfef36b366
parent 331594 651afdf7400c87cc7a2106f7b96570192d085d1d
child 331596 21d0fbfd8a12bebb2879dcf07e058967818fe8bd
push id11020
push userjolesen@mozilla.com
push dateWed, 17 Feb 2016 18:16:38 +0000
reviewersjmuizelaar
bugs1248228
milestone47.0a1
Bug 1248228 - Build fix for SkOSFile_stdio on OpenBSD. r=jmuizelaar
gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
--- a/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
+++ b/gfx/skia/skia/src/ports/SkOSFile_stdio.cpp
@@ -18,33 +18,33 @@
 #endif
 
 #ifdef SK_BUILD_FOR_IOS
 #import <CoreFoundation/CoreFoundation.h>
 
 static FILE* ios_open_from_bundle(const char path[], const char* perm) {
     // Get a reference to the main bundle
     CFBundleRef mainBundle = CFBundleGetMainBundle();
-    
+
     // Get a reference to the file's URL
     CFStringRef pathRef = CFStringCreateWithCString(NULL, path, kCFStringEncodingUTF8);
     CFURLRef imageURL = CFBundleCopyResourceURL(mainBundle, pathRef, NULL, NULL);
     if (!imageURL) {
         return nullptr;
     }
-    
+
     // Convert the URL reference into a string reference
     CFStringRef imagePath = CFURLCopyFileSystemPath(imageURL, kCFURLPOSIXPathStyle);
-    
+
     // Get the system encoding method
     CFStringEncoding encodingMethod = CFStringGetSystemEncoding();
-    
+
     // Convert the string reference into a C string
     const char *finalPath = CFStringGetCStringPtr(imagePath, encodingMethod);
-   
+
     return fopen(finalPath, perm);
 }
 #endif
 
 
 FILE* sk_fopen(const char path[], SkFILE_Flags flags) {
     char    perm[4];
     char*   p = perm;
@@ -52,131 +52,131 @@ FILE* sk_fopen(const char path[], SkFILE
     if (flags & kRead_SkFILE_Flag) {
         *p++ = 'r';
     }
     if (flags & kWrite_SkFILE_Flag) {
         *p++ = 'w';
     }
     *p++ = 'b';
     *p = 0;
-    
+
     //TODO: on Windows fopen is just ASCII or the current code page,
     //convert to utf16 and use _wfopen
     FILE* file = nullptr;
 #ifdef SK_BUILD_FOR_IOS
     // if read-only, try to open from bundle first
     if (kRead_SkFILE_Flag == flags) {
         file = ios_open_from_bundle(path, perm);
     }
     // otherwise just read from the Documents directory (default)
     if (!file) {
 #endif
-        file = ::fopen(path, perm);
+        file = fopen(path, perm);
 #ifdef SK_BUILD_FOR_IOS
     }
 #endif
     if (nullptr == file && (flags & kWrite_SkFILE_Flag)) {
         SkDEBUGF(("sk_fopen: fopen(\"%s\", \"%s\") returned NULL (errno:%d): %s\n",
                   path, perm, errno, strerror(errno)));
     }
     return file;
 }
 
 char* sk_fgets(char* str, int size, FILE* f) {
-    return ::fgets(str, 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);
 
-    long curr = ::ftell(f); // remember where we are
+    long curr = ftell(f); // remember where we are
     if (curr < 0) {
         return 0;
     }
 
-    ::fseek(f, 0, SEEK_END); // go to the end
-    long size = ::ftell(f); // record the size
+    fseek(f, 0, SEEK_END); // go to the end
+    long size = ftell(f); // record the size
     if (size < 0) {
         size = 0;
     }
 
-    ::fseek(f, curr, SEEK_SET); // go back to our prev location
+    fseek(f, curr, SEEK_SET); // go back to our prev location
     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);
+        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);
+        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);
+        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);
+    return fwrite(buffer, 1, byteCount, f);
 }
 
 void sk_fflush(FILE* f) {
     SkASSERT(f);
-    ::fflush(f);
+    fflush(f);
 }
 
 void sk_fsync(FILE* f) {
 #if !defined(_WIN32) && !defined(SK_BUILD_FOR_ANDROID) && !defined(__UCLIBC__) \
         && !defined(_NEWLIB_VERSION)
-    int fd = ::fileno(f);
-    ::fsync(fd);
+    int fd = fileno(f);
+    fsync(fd);
 #endif
 }
 
 bool sk_fseek(FILE* f, size_t byteCount) {
-    int err = ::fseek(f, (long)byteCount, SEEK_SET);
+    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);
+    int err = fseek(f, byteCount, SEEK_CUR);
     return err == 0;
 }
 
 size_t sk_ftell(FILE* f) {
-    long curr = ::ftell(f);
+    long curr = ftell(f);
     if (curr < 0) {
         return 0;
     }
     return curr;
 }
 
 void sk_fclose(FILE* f) {
     SkASSERT(f);
-    ::fclose(f);
+    fclose(f);
 }
 
 bool sk_isdir(const char *path) {
     struct stat status;
     if (0 != stat(path, &status)) {
         return false;
     }
     return SkToBool(status.st_mode & S_IFDIR);