From: Jonathan K. Bullard <jkbullard@gmail.com>
Date: Fri, 6 Feb 2015 19:49:10 +0000 (-0500)
Subject: Fix mismatch of fprintf format specifier and argument type
X-Git-Tag: v2.4_alpha1~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=251c17a0bc55db59b91338d8f306144182755aa4;p=thirdparty%2Fopenvpn.git

Fix mismatch of fprintf format specifier and argument type

This fixes a warning about a mismatch between a fprintf format string
and an argument type on Darwin-64-bit builds:

%lu specifies type 'unsigned long' but the argument has type
'__darwin_suseconds_t' (aka 'int')

Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <CAEsd45SoC+h5tcDraZcQN_MUYzqWYOVvNpkwMo190DLpB32StQ@mail.gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9446

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/error.c b/src/openvpn/error.c
index 9d52962ae..77b6cec06 100644
--- a/src/openvpn/error.c
+++ b/src/openvpn/error.c
@@ -319,7 +319,7 @@ void x_msg_va (const unsigned int flags, const char *format, va_list arglist)
 
 	      fprintf (fp, "%lu.%06lu %x %s%s%s%s",
 		       tv.tv_sec,
-		       tv.tv_usec,
+		       (unsigned long)tv.tv_usec,
 		       flags,
 		       prefix,
 		       prefix_sep,