Title: [202187] trunk/Source/WebCore
- Revision
- 202187
- Author
- [email protected]
- Date
- 2016-06-17 17:09:12 -0700 (Fri, 17 Jun 2016)
Log Message
Unreviewed clean-up after r202186.
* platform/FileSystem.cpp:
(WebCore::filesHaveSameVolume): Don't use C-style formatting.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (202186 => 202187)
--- trunk/Source/WebCore/ChangeLog 2016-06-18 00:03:04 UTC (rev 202186)
+++ trunk/Source/WebCore/ChangeLog 2016-06-18 00:09:12 UTC (rev 202187)
@@ -1,3 +1,10 @@
+2016-06-17 Brent Fulgham <[email protected]>
+
+ Unreviewed clean-up after r202186.
+
+ * platform/FileSystem.cpp:
+ (WebCore::filesHaveSameVolume): Don't use C-style formatting.
+
2016-06-17 Pranjal Jumde <[email protected]>
File scheme should not allow access of a resource on a different volume.
Modified: trunk/Source/WebCore/platform/FileSystem.cpp (202186 => 202187)
--- trunk/Source/WebCore/platform/FileSystem.cpp 2016-06-18 00:03:04 UTC (rev 202186)
+++ trunk/Source/WebCore/platform/FileSystem.cpp 2016-06-18 00:09:12 UTC (rev 202187)
@@ -330,19 +330,18 @@
bool filesHaveSameVolume(const String& sourceFile, const String& destFile)
{
- CString fsRepSourceFile, fsRepDestFile;
- PlatformStat sourceFileStat, destFileStat;
- PlatformFileHandle sourceHandle = -1, destHandle = -1;
- bool result = true;
- fsRepSourceFile = fileSystemRepresentation(sourceFile);
- fsRepDestFile = fileSystemRepresentation(destFile);
+ auto fsRepSourceFile = fileSystemRepresentation(sourceFile);
+ auto fsRepDestFile = fileSystemRepresentation(destFile);
+ PlatformFileHandle sourceHandle = -1, destHandle = -1;
if (!fsRepSourceFile.isNull() && !fsRepDestFile.isNull()) {
sourceHandle = openFile(fsRepSourceFile.data(), OpenForRead);
destHandle = openFile(fsRepDestFile.data(), OpenForRead);
}
+ bool result = true;
+ PlatformStat sourceFileStat, destFileStat;
if (sourceHandle > -1 && destHandle > -1) {
if (platformFileStat(sourceHandle, &sourceFileStat) > -1 && platformFileStat(destHandle, &destFileStat) > -1) {
if (sourceFileStat.st_dev != destFileStat.st_dev)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
