Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: src/ports/SkOSFile_posix.cpp

Issue 1467533003: Eliminate SkFILE - it always is the same as FILE. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-11-20 (Friday) 14:01:26 EST Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkStream.cpp ('k') | src/ports/SkOSFile_stdio.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkOSFile_posix.cpp
diff --git a/src/ports/SkOSFile_posix.cpp b/src/ports/SkOSFile_posix.cpp
index 58662f382f45050380d49c0f611f27ad5f8069d8..396de68bbe8eb4709232aad53951ee4f3a51b162 100644
--- a/src/ports/SkOSFile_posix.cpp
+++ b/src/ports/SkOSFile_posix.cpp
@@ -35,8 +35,8 @@ typedef struct {
ino_t ino;
} SkFILEID;
-static bool sk_ino(SkFILE* a, SkFILEID* id) {
- int fd = fileno((FILE*)a);
+static bool sk_ino(FILE* a, SkFILEID* id) {
+ int fd = fileno(a);
if (fd < 0) {
return 0;
}
@@ -49,7 +49,7 @@ static bool sk_ino(SkFILE* a, SkFILEID* id) {
return true;
}
-bool sk_fidentical(SkFILE* a, SkFILE* b) {
+bool sk_fidentical(FILE* a, FILE* b) {
SkFILEID aID, bID;
return sk_ino(a, &aID) && sk_ino(b, &bID)
&& aID.ino == bID.ino
@@ -82,11 +82,11 @@ void* sk_fdmmap(int fd, size_t* size) {
return addr;
}
-int sk_fileno(SkFILE* f) {
- return fileno((FILE*)f);
+int sk_fileno(FILE* f) {
+ return fileno(f);
}
-void* sk_fmmap(SkFILE* f, size_t* size) {
+void* sk_fmmap(FILE* f, size_t* size) {
int fd = sk_fileno(f);
if (fd < 0) {
return nullptr;
« no previous file with comments | « src/core/SkStream.cpp ('k') | src/ports/SkOSFile_stdio.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698