Changeset 201792 in webkit

Timestamp:

Jun 7, 2016 10:42:47 PM (8 years ago)

Author:

Gyuyoung Kim

Message:

EFL build has been broken since r201761
​https://bugs.webkit.org/show_bug.cgi?id=158512

Unreviewed build fix.

• platform/posix/SharedBufferPOSIX.cpp:

(WebCore::SharedBuffer::createFromReadingFile):
Do not use ? operand in return line. Additionally return nullptr instead of 0.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/posix/SharedBufferPOSIX.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-07  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        EFL build has been broken since r201761
+        https://bugs.webkit.org/show_bug.cgi?id=158512
+
+        Unreviewed build fix.
+
+        * platform/posix/SharedBufferPOSIX.cpp: 
+        (WebCore::SharedBuffer::createFromReadingFile):
+        Do not use ? operand in return line. Additionally return nullptr instead of 0.
+
 2016-06-07  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/posix/SharedBufferPOSIX.cpp

@@ -39 +39 @@
 {
     if (filePath.isEmpty())
-        return 0;
+        return nullptr;
 
     CString filename = fileSystemRepresentation(filePath);
     int fd = open(filename.data(), O_RDONLY);
     if (fd == -1)
-        return 0;
+        return nullptr;
 
     struct stat fileStat;
     if (fstat(fd, &fileStat)) {
         close(fd);
-        return 0;
+        return nullptr;
     }
 
@@ -55 +55 @@
     if (!WTF::convertSafely(fileStat.st_size, bytesToRead)) {
         close(fd);
-        return 0;
+        return nullptr;
     }
 
@@ -67 +67 @@
     close(fd);
 
-    if (totalBytesRead == bytesToRead)
-        return SharedBuffer::adoptVector(buffer);
+    if (totalBytesRead != bytesToRead)
+        return nullptr;
 
-    return nullptr;
+    return SharedBuffer::adoptVector(buffer);
 }