Skip to content

Commit 3671c42

Browse files
flichtenheldcron2
authored andcommitted
route: Make sure various route flags are treated as unsigned
The variables that hold them are already unsigned, make sure the flags are as well to avoid spurious conversion warnings. Change-Id: Ib7f78abbcd52c00a32afdea36ef635681ac8e127 Signed-off-by: Frank Lichtenheld <[email protected]> Acked-by: Arne Schwabe <[email protected]> Message-Id: <[email protected]> URL: https://www.mail-archive.com/[email protected]/msg32684.html Signed-off-by: Gert Doering <[email protected]>
1 parent 487103a commit 3671c42

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/openvpn/route.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ struct route_option
8383
};
8484

8585
/* redirect-gateway flags */
86-
#define RG_ENABLE (1 << 0)
87-
#define RG_LOCAL (1 << 1)
88-
#define RG_DEF1 (1 << 2)
89-
#define RG_BYPASS_DHCP (1 << 3)
90-
#define RG_BYPASS_DNS (1 << 4)
91-
#define RG_REROUTE_GW (1 << 5)
92-
#define RG_AUTO_LOCAL (1 << 6)
93-
#define RG_BLOCK_LOCAL (1 << 7)
86+
#define RG_ENABLE (1u << 0)
87+
#define RG_LOCAL (1u << 1)
88+
#define RG_DEF1 (1u << 2)
89+
#define RG_BYPASS_DHCP (1u << 3)
90+
#define RG_BYPASS_DNS (1u << 4)
91+
#define RG_REROUTE_GW (1u << 5)
92+
#define RG_AUTO_LOCAL (1u << 6)
93+
#define RG_BLOCK_LOCAL (1u << 7)
9494

9595
struct route_option_list
9696
{
@@ -117,9 +117,9 @@ struct route_ipv6_option_list
117117

118118
struct route_ipv4
119119
{
120-
#define RT_DEFINED (1 << 0)
121-
#define RT_ADDED (1 << 1)
122-
#define RT_METRIC_DEFINED (1 << 2)
120+
#define RT_DEFINED (1u << 0)
121+
#define RT_ADDED (1u << 1)
122+
#define RT_METRIC_DEFINED (1u << 2)
123123
struct route_ipv4 *next;
124124
unsigned int flags;
125125
const struct route_option *option;
@@ -227,9 +227,9 @@ struct route_ipv6_gateway_info
227227

228228
struct route_list
229229
{
230-
#define RL_DID_REDIRECT_DEFAULT_GATEWAY (1 << 0)
231-
#define RL_DID_LOCAL (1 << 1)
232-
#define RL_ROUTES_ADDED (1 << 2)
230+
#define RL_DID_REDIRECT_DEFAULT_GATEWAY (1u << 0)
231+
#define RL_DID_LOCAL (1u << 1)
232+
#define RL_ROUTES_ADDED (1u << 2)
233233
unsigned int iflags;
234234

235235
struct route_special_addr spec;

0 commit comments

Comments
 (0)