Changeset 176558 in webkit

Timestamp:

Nov 28, 2014, 1:09:44 AM (12 years ago)

Author:

Csaba Osztrogonác

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:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/linux/SeccompFilters/SeccompFilters.cpp (modified) (2 diffs)
• Shared/linux/SeccompFilters/SeccompFilters.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-28  Csaba Osztrogonác  <ossy@webkit.org>
+
+        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  <ossy@webkit.org>
 

trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.cpp

@@ -43 +43 @@
 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)
@@ -59 +59 @@
 
 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);

trunk/Source/WebKit2/Shared/linux/SeccompFilters/SeccompFilters.h

@@ -55 +55 @@
 
     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();