Skip to content

Commit 5322ef2

Browse files
Ramsay Jonespeff
authored andcommitted
Fix some printf format warnings
commit 51ea551 ("make sure byte swapping is optimal for git" 2009-08-18) introduced a "sane definition for ntohl()/htonl()" for use on some GNU C platforms. Unfortunately, for some of these platforms, this results in the introduction of a problem which is essentially the reverse of a problem that commit 6e1c234 ("Fix some warnings (on cygwin) to allow -Werror" 2008-07-3) was intended to fix. In particular, on platforms where the uint32_t type is defined to be unsigned long, the return type of the new ntohl()/htonl() is causing gcc to issue printf format warnings, such as: warning: long unsigned int format, unsigned int arg (arg 3) (nine such warnings, covering six different files). The earlier commit (6e1c234) needed to suppress these same warnings, except that the types were in the opposite direction; namely the format specifier ("%u") was 'unsigned int' and the argument type (ie the return type of ntohl()) was 'long unsigned int' (aka uint32_t). In order to suppress these warnings, the earlier commit used the (C99) PRIu32 format specifier, since the definition of this macro is suitable for use with the uint32_t type on that platform. This worked because the return type of the (original) platform ntohl()/htonl() functions was uint32_t. In order to suppress these warnings, we change the return type of the new byte swapping functions in the compat/bswap.h header file from 'unsigned int' to uint32_t. Signed-off-by: Ramsay Jones <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Signed-off-by: Jeff King <[email protected]>
1 parent 1be224b commit 5322ef2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

compat/bswap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* Default version that the compiler ought to optimize properly with
1010
* constant values.
1111
*/
12-
static inline unsigned int default_swab32(unsigned int val)
12+
static inline uint32_t default_swab32(uint32_t val)
1313
{
1414
return (((val & 0xff000000) >> 24) |
1515
((val & 0x00ff0000) >> 8) |
@@ -20,7 +20,7 @@ static inline unsigned int default_swab32(unsigned int val)
2020
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
2121

2222
#define bswap32(x) ({ \
23-
unsigned int __res; \
23+
uint32_t __res; \
2424
if (__builtin_constant_p(x)) { \
2525
__res = default_swab32(x); \
2626
} else { \

0 commit comments

Comments
 (0)