Add compiler-specific "examine printf format" attributes to printfs.

courgette/adjustment_method_2.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "courgette/adjustment_method.h"
 
 #include <algorithm>
 #include <limits>
 #include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include <iostream>
 
 #include "base/basictypes.h"
+#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 
 #include "courgette/assembly_program.h"
 #include "courgette/courgette.h"
 #include "courgette/encoded_program.h"
 #include "courgette/image_info.h"
 
 /*
 
@@ skipping 426 matching lines @@
 
 std::string ToString(const Shingle* instance) {
   std::string s;
   const char* sep = "<";
   for (size_t i = 0; i < Shingle::kWidth; ++i) {
     // StringAppendF(&s, "%s%x ", sep, instance.at(i)->label_->rva_);
     s += sep;
     s += ToString(instance->at(i));
     sep = ", ";
   }
-  StringAppendF(&s, ">(%u)@{%d}", instance->exemplar_position_,
-                static_cast<int>(instance->position_count()));
+  StringAppendF(&s, ">(%" PRIuS ")@{%" PRIuS "}", instance->exemplar_position_,
+                instance->position_count());
   return s;
 }
 
 
 bool Shingle::InterningLess::operator()(
     const Shingle& a,
     const Shingle& b) const {
   for (size_t i = 0;  i < kWidth;  ++i) {
     LabelInfo* info_a = a.at(i);
     LabelInfo* info_b = b.at(i);
@@ skipping 95 matching lines @@
   std::string s;
   size_t histogram_size = histogram.size();
   size_t snippet_size = 0;
   for (ShinglePattern::Histogram::const_iterator p = histogram.begin();
        p != histogram.end();
        ++p) {
     if (++snippet_size > snippet_max && snippet_size != histogram_size) {
       s += " ...";
       break;
     }
-    StringAppendF(&s, " %d", p->count());
+    StringAppendF(&s, " %" PRIuS, p->count());
   }
   return s;
 }
 
 std::string HistogramToStringFull(const ShinglePattern::Histogram& histogram,
                                   const char* indent,
                                   size_t snippet_max) {
   std::string s;
 
   size_t histogram_size = histogram.size();
   size_t snippet_size = 0;
   for (ShinglePattern::Histogram::const_iterator p = histogram.begin();
        p != histogram.end();
        ++p) {
     s += indent;
     if (++snippet_size > snippet_max && snippet_size != histogram_size) {
       s += "...\n";
       break;
     }
-    StringAppendF(&s, "(%d) ", p->count());
+    StringAppendF(&s, "(%" PRIuS ") ", p->count());
     s += ToString(&(*p->instance()));
     s += "\n";
   }
   return s;
 }
 
 std::string ToString(const ShinglePattern* pattern, size_t snippet_max = 3) {
   std::string s;
   if (pattern == NULL) {
     s = "<null>";
@@ skipping 14 matching lines @@
   return s;
 }
 
 std::string ShinglePatternToStringFull(const ShinglePattern* pattern,
                                        size_t max) {
   std::string s;
   s += ToString(pattern->index_);
   s += "\n";
   size_t model_size = pattern->model_histogram_.size();
   size_t program_size = pattern->program_histogram_.size();
-  StringAppendF(&s, "  model shingles %u\n", model_size);
+  StringAppendF(&s, "  model shingles %" PRIuS "\n", model_size);
   s += HistogramToStringFull(pattern->model_histogram_, "    ", max);
-  StringAppendF(&s, "  program shingles %u\n", program_size);
+  StringAppendF(&s, "  program shingles %" PRIuS "\n", program_size);
   s += HistogramToStringFull(pattern->program_histogram_, "    ", max);
   return s;
 }
 
 struct ShinglePatternIndexLess {
   bool operator()(const ShinglePattern::Index& a,
                   const ShinglePattern::Index& b) const {
     if (a.hash_ < b.hash_) return true;
     if (a.hash_ > b.hash_) return false;
 
@@ skipping 663 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
 }  // namespace adjustment_method_2
 
 AdjustmentMethod* AdjustmentMethod::MakeShingleAdjustmentMethod() {
   return new adjustment_method_2::Adjuster();
 }
 
 }  // namespace courgette