Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8211 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/core/SkData.cpp b/src/core/SkData.cpp
index 8fbca7a..8c22200 100644
--- a/src/core/SkData.cpp
+++ b/src/core/SkData.cpp
@@ -321,4 +321,3 @@
gEmptySet->ref();
return gEmptySet;
}
-
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index bd5dd32..ed1287e 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -802,24 +802,24 @@
if (fd < 0) {
return false;
}
-
+
off_t offset = lseek(fd, 0, SEEK_END); // find the file size
if (offset == -1) {
close(fd);
return false;
}
(void)lseek(fd, 0, SEEK_SET); // restore file offset to beginning
-
+
// to avoid a 64bit->32bit warning, I explicitly create a size_t size
size_t size = static_cast<size_t>(offset);
-
+
void* addr = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
close(fd);
-
+
if (MAP_FAILED == addr) {
return false;
}
-
+
*addrPtr = addr;
*sizePtr = size;
return true;
@@ -837,7 +837,7 @@
return SkNEW_ARGS(SkMemoryStream, (data.get()));
}
}
-
+
// If we get here, then our attempt at using mmap failed, so try normal
// file access.
SkFILEStream* stream = SkNEW_ARGS(SkFILEStream, (path));
@@ -847,4 +847,3 @@
}
return stream;
}
-