Title: [191278] trunk/Source/WebKit2
Revision
191278
Author
o...@webkit.org
Date
2015-10-18 23:49:28 -0700 (Sun, 18 Oct 2015)

Log Message

Fix the ENABLE(SECCOMP_FILTERS) build after r187030
https://bugs.webkit.org/show_bug.cgi?id=150172

Reviewed by Alexey Proskuryakov.

* Shared/linux/SeccompFilters/Syscall.cpp:
(WebKit::reportUnexpectedSyscall):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (191277 => 191278)


--- trunk/Source/WebKit2/ChangeLog	2015-10-19 02:26:19 UTC (rev 191277)
+++ trunk/Source/WebKit2/ChangeLog	2015-10-19 06:49:28 UTC (rev 191278)
@@ -1,3 +1,13 @@
+2015-10-18  Csaba Osztrogonác  <o...@webkit.org>
+
+        Fix the ENABLE(SECCOMP_FILTERS) build after r187030
+        https://bugs.webkit.org/show_bug.cgi?id=150172
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Shared/linux/SeccompFilters/Syscall.cpp:
+        (WebKit::reportUnexpectedSyscall):
+
 2015-10-18  Joonghun Park  <jh718.p...@samsung.com>
 
         [GTK] Remove WebKitContextMenu related missing annotation warnings

Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/Syscall.cpp (191277 => 191278)


--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/Syscall.cpp	2015-10-19 02:26:19 UTC (rev 191277)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/Syscall.cpp	2015-10-19 06:49:28 UTC (rev 191278)
@@ -65,15 +65,18 @@
 static void reportUnexpectedSyscall(unsigned syscall)
 {
     char buf[128];
-#if defined(__has_builtin) && __has_builtin(__builtin_strlen)
+#if defined(__has_builtin)
+#if __has_builtin(__builtin_strlen)
     // Buffer must be big enough for the literal, plus the number of digits in the largest possible
     // unsigned int, plus one for the newline, plus one more for the trailing null.
     static_assert(__builtin_strlen(message) + std::numeric_limits<unsigned>::digits10 + 2 < sizeof(buf), "Buffer too small");
 #endif
+#endif
     strcpy(buf, message);
     writeUnsignedInt(buf + strlen(buf), syscall);
     strcat(buf, "\n");
-    write(STDERR_FILENO, buf, strlen(buf));
+    int unused __attribute__((unused));
+    unused = write(STDERR_FILENO, buf, strlen(buf));
 }
 
 std::unique_ptr<Syscall> Syscall::createFromContext(ucontext_t* ucontext)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to