Title: [110035] trunk
Revision
110035
Author
commit-qu...@webkit.org
Date
2012-03-07 01:24:07 -0800 (Wed, 07 Mar 2012)

Log Message

[EFL] Build warning: Fix warn_unused_result warnings.
https://bugs.webkit.org/show_bug.cgi?id=79194

Patch by Byungwoo Lee <bw80....@samsung.com> on 2012-03-07
Reviewed by Filip Pizlo.

Fixed build warning which is getting generated when not using return
value of a fuction, especially declared with warn_unused_result
attribute.

Source/WebCore:

* platform/efl/SharedBufferEfl.cpp:
(WebCore::SharedBuffer::createWithContentsOfFile):

Tools:

* DumpRenderTree/efl/ImageDiff.cpp:
(printImage):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (110034 => 110035)


--- trunk/Source/WebCore/ChangeLog	2012-03-07 09:04:58 UTC (rev 110034)
+++ trunk/Source/WebCore/ChangeLog	2012-03-07 09:24:07 UTC (rev 110035)
@@ -1,3 +1,17 @@
+2012-03-07  Byungwoo Lee  <bw80....@samsung.com>
+
+        [EFL] Build warning: Fix warn_unused_result warnings.
+        https://bugs.webkit.org/show_bug.cgi?id=79194
+
+        Reviewed by Filip Pizlo.
+
+        Fixed build warning which is getting generated when not using return
+        value of a fuction, especially declared with warn_unused_result
+        attribute.
+
+        * platform/efl/SharedBufferEfl.cpp:
+        (WebCore::SharedBuffer::createWithContentsOfFile):
+
 2012-03-07  Kent Tamura  <tk...@chromium.org>
 
         Cleanup of RenderTextControl::adjustControlHeightBasedOnLineHeight()

Modified: trunk/Source/WebCore/platform/efl/SharedBufferEfl.cpp (110034 => 110035)


--- trunk/Source/WebCore/platform/efl/SharedBufferEfl.cpp	2012-03-07 09:04:58 UTC (rev 110034)
+++ trunk/Source/WebCore/platform/efl/SharedBufferEfl.cpp	2012-03-07 09:24:07 UTC (rev 110035)
@@ -61,10 +61,10 @@
         return 0;
     }
 
-    fread(result->m_buffer.data(), 1, fileStat.st_size, file);
+    const size_t bytesRead = fread(result->m_buffer.data(), 1, fileStat.st_size, file);
     fclose(file);
 
-    return result.release();
+    return bytesRead == static_cast<unsigned>(fileStat.st_size) ? result.release() : 0;
 }
 
 } // namespace WebCore

Modified: trunk/Tools/ChangeLog (110034 => 110035)


--- trunk/Tools/ChangeLog	2012-03-07 09:04:58 UTC (rev 110034)
+++ trunk/Tools/ChangeLog	2012-03-07 09:24:07 UTC (rev 110035)
@@ -1,3 +1,17 @@
+2012-03-07  Byungwoo Lee  <bw80....@samsung.com>
+
+        [EFL] Build warning: Fix warn_unused_result warnings.
+        https://bugs.webkit.org/show_bug.cgi?id=79194
+
+        Reviewed by Filip Pizlo.
+
+        Fixed build warning which is getting generated when not using return
+        value of a fuction, especially declared with warn_unused_result
+        attribute.
+
+        * DumpRenderTree/efl/ImageDiff.cpp:
+        (printImage):
+
 2012-03-07  Kangil Han  <kangil....@samsung.com>
 
         [DRT] Remove PlainTextController implementations.

Modified: trunk/Tools/DumpRenderTree/efl/ImageDiff.cpp (110034 => 110035)


--- trunk/Tools/DumpRenderTree/efl/ImageDiff.cpp	2012-03-07 09:04:58 UTC (rev 110034)
+++ trunk/Tools/DumpRenderTree/efl/ImageDiff.cpp	2012-03-07 09:24:07 UTC (rev 110035)
@@ -209,8 +209,15 @@
 
             unsigned char buffer[2048];
             ssize_t bytesRead;
-            while ((bytesRead = read(tempImageFd, buffer, sizeof(buffer))) > 0)
-                write(1, buffer, bytesRead);
+            while ((bytesRead = read(tempImageFd, buffer, sizeof(buffer))) > 0) {
+                ssize_t bytesWritten = 0;
+                ssize_t count;
+                do {
+                    if ((count = write(1, buffer + bytesWritten, bytesRead - bytesWritten)) <= 0)
+                        break;
+                    bytesWritten += count;
+                } while (bytesWritten < bytesRead);
+            }
         }
     }
     close(tempImageFd);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to