From: Antonio Quartulli Date: Sat, 1 May 2021 13:06:38 +0000 (+0200) Subject: windows: use appropriate and portable format specifier for 64bit pointer X-Git-Tag: v2.6_beta1~520 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=396c4e4903fda078536016b7ada97862f713bd94;p=thirdparty%2Fopenvpn.git windows: use appropriate and portable format specifier for 64bit pointer To print a 64bit poiner, fprintf() must be provided with the appropriate format specifier. The most portable in this case is PRIx64, which is redefined accordingly on each platform. It comes from inttypes.h and it's the recommended way to print a 64bit long hex value. Fixes various warnings of this type: event.c: In function ‘we_ctl’: event.c:235:24: warning: 'I' flag used with ‘%x’ gnu_printf format [-Wformat=] 235 | dmsg(D_EVENT_WAIT, "WE_CTL n=%d ev=%p rwflags=0x%04x arg=" ptr_format, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ error.h:151:68: note: in definition of macro ‘dmsg’ 151 | #define dmsg(flags, ...) do { if (msg_test(flags)) {x_msg((flags), __VA_ARGS__);} EXIT_FATAL(flags); } while (false) | ^~~~~~~~~~~ event.c:235:24: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 6 has type ‘long long unsigned int’ [-Wformat=] 235 | dmsg(D_EVENT_WAIT, "WE_CTL n=%d ev=%p rwflags=0x%04x arg=" ptr_format, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ...... 239 | (ptr_type)arg); | ~~~~~~~~~~~~~ | | | long long unsigned int Signed-off-by: Antonio Quartulli Acked-by: Arne Schwabe Message-Id: <20210501130640.9330-2-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22268.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/common.h b/src/openvpn/common.h index 544fa238e..6575bcb7d 100644 --- a/src/openvpn/common.h +++ b/src/openvpn/common.h @@ -44,7 +44,7 @@ typedef int interval_t; * Printf formats for special types */ #ifdef _WIN64 -#define ptr_format "0x%I64x" +#define ptr_format "0x%016" PRIx64 #else #define ptr_format "0x%08lx" #endif