Title: [176558] trunk/Source/WebKit2
- Revision
- 176558
- Author
- [email protected]
- Date
- 2014-11-28 01:09:44 -0800 (Fri, 28 Nov 2014)
Log Message
Fix -Wc++11-narrowing error in SeccompFilters.cpp
https://bugs.webkit.org/show_bug.cgi?id=139079
Reviewed by Carlos Garcia Campos.
* Shared/linux/SeccompFilters/SeccompFilters.cpp:
(WebKit::SeccompFilters::addRule):
* Shared/linux/SeccompFilters/SeccompFilters.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176557 => 176558)
--- trunk/Source/WebKit2/ChangeLog 2014-11-28 09:04:21 UTC (rev 176557)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-28 09:09:44 UTC (rev 176558)
@@ -1,5 +1,16 @@
2014-11-28 Csaba Osztrogonác <[email protected]>
+ Fix -Wc++11-narrowing error in SeccompFilters.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=139079
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Shared/linux/SeccompFilters/SeccompFilters.cpp:
+ (WebKit::SeccompFilters::addRule):
+ * Shared/linux/SeccompFilters/SeccompFilters.h:
+
+2014-11-28 Csaba Osztrogonác <[email protected]>
+
[WK2] SecComp buildfix after r168605 and r168999
https://bugs.webkit.org/show_bug.cgi?id=139080
Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.cpp (176557 => 176558)
--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.cpp 2014-11-28 09:04:21 UTC (rev 176557)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.cpp 2014-11-28 09:09:44 UTC (rev 176558)
@@ -42,7 +42,7 @@
COMPILE_ASSERT(SeccompFilters::NotEqual == static_cast<SeccompFilters::Operator>(SCMP_CMP_NE), NotEqual);
COMPILE_ASSERT(SeccompFilters::Equal == static_cast<SeccompFilters::Operator>(SCMP_CMP_EQ), Equal);
-COMPILE_ASSERT(sizeof(scmp_datum_t) == sizeof(long long), scmp_datum_t);
+COMPILE_ASSERT(sizeof(scmp_datum_t) == sizeof(uint64_t), scmp_datum_t);
SeccompFilters::SeccompFilters(Action defaultAction)
: m_context(seccomp_init(defaultAction))
@@ -58,8 +58,8 @@
}
void SeccompFilters::addRule(const char* syscallName, Action action,
- unsigned argNum1, Operator operator1, long long data1,
- unsigned argNum2, Operator operator2, long long data2)
+ unsigned argNum1, Operator operator1, uint64_t data1,
+ unsigned argNum2, Operator operator2, uint64_t data2)
{
int syscall = seccomp_syscall_resolve_name(syscallName);
if (syscall == __NR_SCMP_ERROR)
Modified: trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.h (176557 => 176558)
--- trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.h 2014-11-28 09:04:21 UTC (rev 176557)
+++ trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.h 2014-11-28 09:09:44 UTC (rev 176558)
@@ -54,8 +54,8 @@
void* context() { return m_context; };
void addRule(const char* syscallName, Action,
- unsigned argNum1 = 0, Operator operator1 = NotSet, long long data1 = 0,
- unsigned argNum2 = 0, Operator operator2 = NotSet, long long data2 = 0);
+ unsigned argNum1 = 0, Operator operator1 = NotSet, uint64_t data1 = 0,
+ unsigned argNum2 = 0, Operator operator2 = NotSet, uint64_t data2 = 0);
void initialize();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
