Merge "Fix printf format specifiers."

aosp-mirror · Jan 13, 2015 · 64d5b03 · 64d5b03
2 parents c0221e7 + ff76246
commit 64d5b03
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tools/hprof-conv/HprofConv.c b/tools/hprof-conv/HprofConv.c
@@ -230,7 +230,7 @@ static int ebReadData(ExpandBuf* pBuf, FILE* in, size_t count, int eofExpected)
         if (eofExpected && feof(in) && !ferror(in)) {
             /* return without reporting an error */
         } else {
-            fprintf(stderr, "ERROR: read %d of %d bytes\n", actual, count);
+            fprintf(stderr, "ERROR: read %zu of %zu bytes\n", actual, count);
             return -1;
         }
     }
@@ -253,7 +253,7 @@ static int ebWriteData(ExpandBuf* pBuf, FILE* out)
 
     actual = fwrite(pBuf->storage, 1, pBuf->curLen, out);
     if (actual != pBuf->curLen) {
-        fprintf(stderr, "ERROR: write %d of %d bytes\n", actual, pBuf->curLen);
+        fprintf(stderr, "ERROR: write %zu of %zu bytes\n", actual, pBuf->curLen);
         return -1;
     }
 
@@ -533,8 +533,8 @@ static int processHeapDump(ExpandBuf* pBuf, FILE* out)
 
         /* shouldn't get here */
         default:
-            fprintf(stderr, "ERROR: unexpected subtype 0x%02x at offset %d\n",
-                subType, buf - origBuf);
+            fprintf(stderr, "ERROR: unexpected subtype 0x%02x at offset %zu\n",
+                subType, (size_t) (buf - origBuf));
             goto bail;
         }