[Openvpn-devel,1/3] windows: use appropriate and portable format specifier for 64bit pointer

Message ID 20210501130640.9330-2-a@unstable.cc
State Accepted
Headers show
Series
  • windows: kill a couple of warnings
Related show

Commit Message

Antonio Quartulli May 1, 2021, 1:06 p.m.
From: Antonio Quartulli <antonio@openvpn.net>

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 <a@unstable.cc>
---
 src/openvpn/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arne Schwabe May 2, 2021, 12:14 p.m. | #1
Am 01.05.21 um 15:06 schrieb Antonio Quartulli:
> From: Antonio Quartulli <antonio@openvpn.net>
> 
> 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.

Yes. I checked at there seem to be no portable integer same size as
pointer, so the ifdef with a 64 bit int is okay here.

Acked-By: Arne Schwabe <arne@rfc2549.org>
Gert Doering May 2, 2021, 8:40 p.m. | #2
Your patch has been applied to the master branch.

commit 396c4e4903fda078536016b7ada97862f713bd94
Author: Antonio Quartulli
Date:   Sat May 1 15:06:38 2021 +0200

     windows: use appropriate and portable format specifier for 64bit pointer

     Signed-off-by: Antonio Quartulli <a@unstable.cc>
     Acked-by: Arne Schwabe <arne@rfc2549.org>
     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 <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/common.h b/src/openvpn/common.h
index 544fa238..6575bcb7 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