kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Ramsay Jones 2010-09-09 18:24:06 +01:00 committed by Junio C Hamano
parent 3b3a8ed4be
commit 5418d96ddc
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-compat-util.h
View File

@ -160,6 +160,10 @@ extern char *gitbasename(char *);
#define PRIx32 "x" #define PRIx32 "x"
#endif #endif


#ifndef PRIo32
#define PRIo32 "o"
#endif

#ifndef PATH_SEP #ifndef PATH_SEP
#define PATH_SEP ':' #define PATH_SEP ':'
#endif #endif

9
vcs-svn/fast_export.c
View File

@ -25,7 +25,7 @@ void fast_export_modify(uint32_t depth, uint32_t *path, uint32_t mode,
uint32_t mark) uint32_t mark)
{ {
/* Mode must be 100644, 100755, 120000, or 160000. */ /* Mode must be 100644, 100755, 120000, or 160000. */
printf("M %06o :%d ", mode, mark); printf("M %06"PRIo32" :%"PRIu32" ", mode, mark);
pool_print_seq(depth, path, '/', stdout); pool_print_seq(depth, path, '/', stdout);
putchar('\n'); putchar('\n');
} }
@ -38,7 +38,8 @@ void fast_export_commit(uint32_t revision, uint32_t author, char *log,
if (!log) if (!log)
log = ""; log = "";
if (~uuid && ~url) { if (~uuid && ~url) {
snprintf(gitsvnline, MAX_GITSVN_LINE_LEN, "\n\ngit-svn-id: %s@%d %s\n", snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
"\n\ngit-svn-id: %s@%"PRIu32" %s\n",
pool_fetch(url), revision, pool_fetch(uuid)); pool_fetch(url), revision, pool_fetch(uuid));
} else { } else {
*gitsvnline = '\0'; *gitsvnline = '\0';
@ -59,7 +60,7 @@ void fast_export_commit(uint32_t revision, uint32_t author, char *log,
repo_diff(revision - 1, revision); repo_diff(revision - 1, revision);
fputc('\n', stdout); fputc('\n', stdout);


printf("progress Imported commit %d.\n\n", revision); printf("progress Imported commit %"PRIu32".\n\n", revision);
} }


void fast_export_blob(uint32_t mode, uint32_t mark, uint32_t len) 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)
buffer_skip_bytes(5); buffer_skip_bytes(5);
len -= 5; len -= 5;
} }
printf("blob\nmark :%d\ndata %d\n", mark, len); printf("blob\nmark :%"PRIu32"\ndata %"PRIu32"\n", mark, len);
buffer_copy_bytes(len); buffer_copy_bytes(len);
fputc('\n', stdout); fputc('\n', stdout);
} }

2
vcs-svn/svndump.c
View File

@ -257,7 +257,7 @@ void svndump_read(const char *url)
handle_node(); handle_node();
active_ctx = REV_CTX; active_ctx = REV_CTX;
} else { } else {
fprintf(stderr, "Unexpected content length header: %d\n", len); fprintf(stderr, "Unexpected content length header: %"PRIu32"\n", len);
buffer_skip_bytes(len); buffer_skip_bytes(len);
} }
} }