upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-05-28 04:03:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Windows: fix wrong printf format in x_check_status

Browse source 
Relevant defines/typedefs:
typedef UINT_PTR        SOCKET;
if defined(_WIN64)
 typedef unsigned __int64 UINT_PTR;
else
 typedef unsigned int UINT_PTR;
endif
ifdef _WIN64
 define PRIuPTR  PRIu64
else
 define PRIuPTR  PRIu32
endif

Remove duplicated include of inttypes.h

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Lev Stipakov <lstipakov@gmail.com>
Message-Id: <20230207134333.52221-1-frank@lichtenheld.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26166.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
This commit is contained in:
Frank Lichtenheld 2023-02-07 14:43:33 +01:00 committed by Gert Doering
parent 48495ce3cd
commit a95705be85
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/openvpn/error.c
View file

@ -695,14 +695,14 @@ x_check_status(int status,
{
if (extended_msg)
{
msg(x_cs_info_level, "%s %s [%s]: %s (fd=%d,code=%d)", description,
msg(x_cs_info_level, "%s %s [%s]: %s (fd=" SOCKET_PRINTF ",code=%d)", description,
sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "",
extended_msg, openvpn_strerror(my_errno, crt_error, &gc),
sock ? sock->sd : -1, my_errno);
}
else
{
msg(x_cs_info_level, "%s %s: %s (fd=%d,code=%d)", description,
msg(x_cs_info_level, "%s %s: %s (fd=" SOCKET_PRINTF ",code=%d)", description,
sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "",
openvpn_strerror(my_errno, crt_error, &gc),
sock ? sock->sd : -1, my_errno);

3
src/openvpn/syshead.h
View file

@ -48,7 +48,6 @@
#ifdef _MSC_VER /* Visual Studio */
#define __func__ __FUNCTION__
#define __attribute__(x)
#include <inttypes.h>
#endif
#if defined(__APPLE__)
@ -442,9 +441,11 @@ typedef unsigned short sa_family_t;
*/
#ifdef _WIN32
#define SOCKET_UNDEFINED (INVALID_SOCKET)
#define SOCKET_PRINTF "%" PRIuPTR
typedef SOCKET socket_descriptor_t;
#else
#define SOCKET_UNDEFINED (-1)
#define SOCKET_PRINTF "%d"
typedef int socket_descriptor_t;
#endif