From: Alon Bar-Lev <alon.barlev@gmail.com>
Date: Sun, 25 Mar 2012 11:27:02 +0000 (+0200)
Subject: cleanup: flags should not be bool
X-Git-Tag: v2.3_alpha2~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5cfe3d4c1897785b32565dbb59c914fac62b0ed9;p=thirdparty%2Fopenvpn.git

cleanup: flags should not be bool

Discussed at [1][2][3].

[1] https://bugs.gentoo.org/show_bug.cgi?id=297854#c2
[2] https://297854.bugs.gentoo.org/attachment.cgi?id=214304
[3] http://sourceforge.net/mailarchive/forum.php?thread_name=20120325111517.GI1359%40greenie.muc.de&forum_name=openvpn-devel

Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Signed-off-by: David Sommerseth <davids@redhat.com>
---

diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c
index 608213b19..6b1f8d201 100644
--- a/src/openvpn/socket.c
+++ b/src/openvpn/socket.c
@@ -2606,7 +2606,7 @@ struct in6_addr add_in6_addr( struct in6_addr base, uint32_t add )
 
 /* set environmental variables for ip/port in *addr */
 void
-setenv_sockaddr (struct env_set *es, const char *name_prefix, const struct openvpn_sockaddr *addr, const bool flags)
+setenv_sockaddr (struct env_set *es, const char *name_prefix, const struct openvpn_sockaddr *addr, const unsigned int flags)
 {
   char name_buf[256];
 
@@ -2643,7 +2643,7 @@ setenv_sockaddr (struct env_set *es, const char *name_prefix, const struct openv
 }
 
 void
-setenv_in_addr_t (struct env_set *es, const char *name_prefix, in_addr_t addr, const bool flags)
+setenv_in_addr_t (struct env_set *es, const char *name_prefix, in_addr_t addr, const unsigned int flags)
 {
   if (addr || !(flags & SA_SET_IF_NONZERO))
     {
@@ -2659,7 +2659,7 @@ void
 setenv_link_socket_actual (struct env_set *es,
 			   const char *name_prefix,
 			   const struct link_socket_actual *act,
-			   const bool flags)
+			   const unsigned int flags)
 {
   setenv_sockaddr (es, name_prefix, &act->dest, flags);
 }
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index 4a4f75df0..ef21cb611 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -372,17 +372,17 @@ struct in6_addr add_in6_addr( struct in6_addr base, uint32_t add );
 void setenv_sockaddr (struct env_set *es,
 		      const char *name_prefix,
 		      const struct openvpn_sockaddr *addr,
-		      const bool flags);
+		      const unsigned int flags);
 
 void setenv_in_addr_t (struct env_set *es,
 		       const char *name_prefix,
 		       in_addr_t addr,
-		       const bool flags);
+		       const unsigned int flags);
 
 void setenv_link_socket_actual (struct env_set *es,
 				const char *name_prefix,
 				const struct link_socket_actual *act,
-				const bool flags);
+				const unsigned int flags);
 
 void bad_address_length (int actual, int expected);