]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
debug: always use %zu in format string for size_t
authorJustin Viiret <justin.viiret@intel.com>
Thu, 25 Aug 2016 03:26:27 +0000 (13:26 +1000)
committerMatthew Barr <matthew.barr@intel.com>
Fri, 28 Oct 2016 03:43:34 +0000 (14:43 +1100)
src/nfa/tamaramacompile.cpp
src/rose/rose_build_bytecode.cpp
src/rose/rose_build_exclusive.cpp
src/util/clique.cpp

index 73d195958b2d15fad2e1178c82c298fe890fe2c2..521c9bb248c033f9d6690432ededad2ba1434467 100644 (file)
@@ -117,7 +117,7 @@ aligned_unique_ptr<NFA> buildTamarama(const TamaInfo &tamaInfo, const u32 queue,
     remapTops(tamaInfo, top_base, out_top_remap);
 
     size_t subSize = tamaInfo.subengines.size();
-    DEBUG_PRINTF("subSize:%lu\n", subSize);
+    DEBUG_PRINTF("subSize:%zu\n", subSize);
     size_t total_size =
         sizeof(NFA) +               // initial NFA structure
         sizeof(Tamarama) +          // Tamarama structure
index d4f2e069ec0bdbe10ec9388fece1e0045d59789b..b8baa9c15d1772a1dce8954909a1150e2a5e7ac2 100644 (file)
@@ -1541,7 +1541,7 @@ void buildInfixContainer(RoseGraph &g, build_context &bc,
         for (const auto &sub : subengines) {
             const auto &verts = sub.vertices;
             for (const auto &v : verts) {
-                DEBUG_PRINTF("vert id:%lu\n", g[v].idx);
+                DEBUG_PRINTF("vert id:%zu\n", g[v].idx);
                 g[v].left.tamarama = tamaProto;
             }
         }
@@ -1560,7 +1560,7 @@ void buildSuffixContainer(RoseGraph &g, build_context &bc,
         for (const auto &sub : subengines) {
             const auto &verts = sub.vertices;
             for (const auto &v : verts) {
-                DEBUG_PRINTF("vert id:%lu\n", g[v].idx);
+                DEBUG_PRINTF("vert id:%zu\n", g[v].idx);
                 g[v].suffix.tamarama = tamaProto;
             }
             const auto &v = verts[0];
@@ -1741,7 +1741,7 @@ void findExclusiveInfixes(RoseBuildImpl &build, build_context &bc,
     }
 
     if (leftfixes.size() > 1) {
-        DEBUG_PRINTF("leftfix size:%lu\n", leftfixes.size());
+        DEBUG_PRINTF("leftfix size:%zu\n", leftfixes.size());
         vector<vector<u32>> groups;
         exclusiveAnalysisInfix(build, vertex_map, roleInfoSet, groups);
         buildExclusiveInfixes(build, bc, qif, infixTriggers, vertex_map,
@@ -2178,7 +2178,7 @@ void findExclusiveSuffixes(RoseBuildImpl &tbi, build_context &bc,
     }
 
     if (suffixes.size() > 1) {
-        DEBUG_PRINTF("suffix size:%lu\n", suffixes.size());
+        DEBUG_PRINTF("suffix size:%zu\n", suffixes.size());
         vector<vector<u32>> groups;
         exclusiveAnalysisSuffix(tbi, vertex_map, roleInfoSet, groups);
         buildExclusiveSuffixes(tbi, bc, qif, suffixTriggers, vertex_map,
index c9e8d215caa6f2cf6a995434c0b47aeccf67bdf1..e91cc297107df3744a0056a34b05d6980a8ec662 100644 (file)
@@ -306,12 +306,12 @@ void findCliques(const map<u32, set<u32>> &exclusiveGroups,
     // Find clique groups
     const auto &clique = removeClique(*cg);
     for (const auto &i : clique) {
-        DEBUG_PRINTF("cliq:%lu\n", i.size());
+        DEBUG_PRINTF("cliq:%zu\n", i.size());
         if (i.size() > 1) {
             exclusive_roles.push_back(i);
         }
     }
-    DEBUG_PRINTF("Clique graph size:%lu\n", exclusive_roles.size());
+    DEBUG_PRINTF("Clique graph size:%zu\n", exclusive_roles.size());
 }
 
 static
@@ -326,7 +326,7 @@ map<u32, set<u32>> findExclusiveGroups(const RoseBuildImpl &build,
         set<u32> group;
         set<RoseVertex> q1(vertex_map.at(i).begin(),
                            vertex_map.at(i).end());
-        DEBUG_PRINTF("vertex set:%lu\n", q1.size());
+        DEBUG_PRINTF("vertex set:%zu\n", q1.size());
         for (const auto &val : s) {
             set<RoseVertex> q2(vertex_map.at(val).begin(),
                                vertex_map.at(val).end());
index ea22779c0fec2421f71c67a4ea9f1e8d37101a70..79f0693233a15fd8c5b278e65a5a43b85da31d48 100644 (file)
@@ -103,7 +103,7 @@ bool graph_empty(const Graph &g) {
 }
 
 vector<vector<u32>> removeClique(CliqueGraph &cg) {
-    DEBUG_PRINTF("graph size:%lu\n", num_vertices(cg));
+    DEBUG_PRINTF("graph size:%zu\n", num_vertices(cg));
     vector<vector<u32>> cliquesVec = {findCliqueGroup(cg)};
     while (!graph_empty(cg)) {
         const vector<u32> &c = cliquesVec.back();