@matheusbsbs / matheus-bagliano / commits / 5418d96ddc
Fork 0

vcs-svn: Fix some printf format compiler warnings

In particular, on systems that define uint32_t as an unsigned long, gcc complains as follows: CC vcs-svn/fast_export.o vcs-svn/fast_export.c: In function `fast_export_modify': vcs-svn/fast_export.c:28: warning: unsigned int format, uint32_t arg (arg 2) vcs-svn/fast_export.c:28: warning: int format, uint32_t arg (arg 3) vcs-svn/fast_export.c: In function `fast_export_commit': vcs-svn/fast_export.c:42: warning: int format, uint32_t arg (arg 5) vcs-svn/fast_export.c:62: warning: int format, uint32_t arg (arg 2) vcs-svn/fast_export.c: In function `fast_export_blob': vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 2) vcs-svn/fast_export.c:72: warning: int format, uint32_t arg (arg 3) CC vcs-svn/svndump.o vcs-svn/svndump.c: In function `svndump_read': vcs-svn/svndump.c:260: warning: int format, uint32_t arg (arg 3) In order to suppress the warnings we use the C99 format specifier macros PRIo32 and PRIu32 from <inttypes.h>. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramsay Jones committed Sep 9, 2010 at 18:24 UTC 5418d96ddca8134b5abeb99430f61c062d91f722
3 files changed +10 -5
git-compat-util.h
+4
@@ -160,6 +160,10 @@ extern char *gitbasename(char *);
160 #define PRIx32 "x"
161 #endif
162
163 +#ifndef PRIo32
164 +#define PRIo32 "o"
165 +#endif
166 +
167 #ifndef PATH_SEP
168 #define PATH_SEP ':'
169 #endif
vcs-svn/fast_export.c
+5 -4
@@ -25,7 +25,7 @@ void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
25 uint32_t mark)
26 {
27 /* Mode must be 100644, 100755, 120000, or 160000. */
28 - printf("M %06o :%d ", mode, mark);
28 + printf("M %06"PRIo32" :%"PRIu32" ", mode, mark);
29 pool_print_seq(depth, path, '/', stdout);
30 putchar('\n');
31 }
@@ -38,7 +38,8 @@ void fast_export_commit(uint32_t revision, uint32_t author, char *log,
38 if (!log)
39 log = "";
40 if (~uuid && ~url) {
41 - snprintf(gitsvnline, MAX_GITSVN_LINE_LEN, "\n\ngit-svn-id: %s@%d %s\n",
41 + snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
42 + "\n\ngit-svn-id: %s@%"PRIu32" %s\n",
43 pool_fetch(url), revision, pool_fetch(uuid));
44 } else {
45 *gitsvnline = '\0';
@@ -59,7 +60,7 @@ void fast_export_commit(uint32_t revision, uint32_t author, char *log,
60 repo_diff(revision - 1, revision);
61 fputc('\n', stdout);
62
62 - printf("progress Imported commit %d.\n\n", revision);
63 + printf("progress Imported commit %"PRIu32".\n\n", revision);
64 }
65
66 void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len)
@@ -69,7 +70,7 @@ void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len)
70 buffer_skip_bytes(5);
71 len -= 5;
72 }
72 - printf("blob\nmark :%d\ndata %d\n", mark, len);
73 + printf("blob\nmark :%"PRIu32"\ndata %"PRIu32"\n", mark, len);
74 buffer_copy_bytes(len);
75 fputc('\n', stdout);
76 }
vcs-svn/svndump.c
+1 -1
@@ -257,7 +257,7 @@ void svndump_read(const char *url)
257 handle_node();
258 active_ctx = REV_CTX;
259 } else {
260 - fprintf(stderr, "Unexpected content length header: %d\n", len);
260 + fprintf(stderr, "Unexpected content length header: %"PRIu32"\n", len);
261 buffer_skip_bytes(len);
262 }
263 }