commit f5cef166216b25fc8a23db1c1933f81f22fa453e
author Chih-Hung Hsieh <chh@google.com> Tue Dec 11 10:59:28 2018 -0800
committer Chih-Hung Hsieh <chh@google.com> Tue Dec 11 10:59:28 2018 -0800
tree 8255aaff40013009348c93d77521a0695278f209
parent 742a1bc8dba58be3593fbf161794fc2b87e6d53b

Fix cert-dcl16-c clang-tidy warnings.

Bug: 120614316
Test: make with WITH_TIDY=1 DEFAULT_GLOBAL_TIDY_CHECKS=-*,cert-dcl16-c
Change-Id: Ib341908467f11ed5fccd6eddb8909fe5170fea9e

tests/iptables/qtaguid/socketTag.cpp

diff --git a/tests/iptables/qtaguid/socketTag.cpp b/tests/iptables/qtaguid/socketTag.cpp
index 8505fca..f29ae84 100644
--- a/tests/iptables/qtaguid/socketTag.cpp
+++ b/tests/iptables/qtaguid/socketTag.cpp
@@ -194,15 +194,15 @@
         fake_uid2 = testRand();
         valid_tag1 = ((uint64_t)my_pid << 48) | ((uint64_t)testRand() << 32);
         valid_tag2 = ((uint64_t)my_pid << 48) | ((uint64_t)testRand() << 32);
-        valid_tag2 &= 0xffffff00ffffffffllu;  // Leave some room to make counts visible.
+        valid_tag2 &= 0xffffff00ffffffffLLU;  // Leave some room to make counts visible.
         testPrintI("* start: pid=%lu uid=%lu uid1=0x%lx/%lu uid2=0x%lx/%lu"
                    " tag1=0x%" PRIx64 "/%" PRIu64 " tag2=0x%" PRIx64 "/% " PRIu64,
                    (unsigned long)my_pid, (unsigned long)my_uid,
                    (unsigned long)fake_uid, (unsigned long)fake_uid,
                    (unsigned long)fake_uid2, (unsigned long)fake_uid2,
                    valid_tag1, valid_tag1, valid_tag2, valid_tag2);
-        max_uint_tag = 0xffffffff00000000llu;
-        max_uint_tag = 1llu << 63 | (((uint64_t)my_pid << 48) ^ max_uint_tag);
+        max_uint_tag = 0xffffffff00000000LLU;
+        max_uint_tag = 1LLU << 63 | (((uint64_t)my_pid << 48) ^ max_uint_tag);
 
         testPrintI("kernel has qtaguid");
         ctrl_fd = openCtrl();
@@ -243,12 +243,12 @@
    uint64_t valid_tag1;
    uint64_t valid_tag2;
    uint64_t max_uint_tag;
-   static const uint64_t invalid_tag1 = 0x0000000100000001llu;
+   static const uint64_t invalid_tag1 = 0x0000000100000001LLU;
    static const int max_tags = 5;
 };
 
 TEST_F(SocketTaggingTest, TagData) {
-    max_uint_tag = 0xffffffff00000000llu;
+    max_uint_tag = 0xffffffff00000000LLU;
     char *max_tags_str;
 
     testPrintI("setup tag limit");