[go: nahoru, domu]

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

Functions that take a printf-style format get a new annotation, which
produces a bunch of compiler warnings when you use printf impoperly.
This change adds the annotations and fixes the warnings.

We now must use PRId64 for 64-bit numbers and the PRIsz for size_t.

Review URL: http://codereview.chromium.org/339059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32600 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc
index 162948c0..f253dc1 100644
--- a/net/http/partial_data.cc
+++ b/net/http/partial_data.cc
@@ -4,6 +4,7 @@
 
 #include "net/http/partial_data.h"
 
+#include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
@@ -237,10 +238,12 @@
 
     DCHECK(byte_range_.HasFirstBytePosition());
     DCHECK(byte_range_.HasLastBytePosition());
-    headers->AddHeader(StringPrintf("%s: bytes %lld-%lld/%lld", kRangeHeader,
-                                    byte_range_.first_byte_position(),
-                                    byte_range_.last_byte_position(),
-                                    resource_size_));
+    headers->AddHeader(
+        StringPrintf("%s: bytes %" PRId64 "-%" PRId64 "/%" PRId64,
+                     kRangeHeader,
+                     byte_range_.first_byte_position(),
+                     byte_range_.last_byte_position(),
+                     resource_size_));
     range_len = byte_range_.last_byte_position() -
                 byte_range_.first_byte_position() + 1;
   } else {
@@ -250,12 +253,13 @@
     range_len = resource_size_;
   }
 
-  headers->AddHeader(StringPrintf("%s: %lld", kLengthHeader, range_len));
+  headers->AddHeader(StringPrintf("%s: %" PRId64, kLengthHeader, range_len));
 }
 
 void PartialData::FixContentLength(HttpResponseHeaders* headers) {
   headers->RemoveHeader(kLengthHeader);
-  headers->AddHeader(StringPrintf("%s: %lld", kLengthHeader, resource_size_));
+  headers->AddHeader(StringPrintf("%s: %" PRId64, kLengthHeader,
+                                  resource_size_));
 }
 
 int PartialData::CacheRead(disk_cache::Entry* entry, IOBuffer* data,