fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 08:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: avoid -Wshadow

Browse source 
NM wouldn't build on Gentoo with GCC 4.6.3.
This commit is contained in:
Pavel Šimerda 2012-11-13 19:45:59 +01:00
parent e9e2c5645f
commit e19ef483b7
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/settings/plugins/keyfile/tests/test-keyfile.c
View file

@ -50,9 +50,9 @@
#define TEST_WIRELESS_FILE TEST_KEYFILES_DIR"/Test_Wireless_Connection"
static void
check_ip4_address (NMSettingIP4Config *config, int index, const char *address_str, int plen, const char *gateway_str)
check_ip4_address (NMSettingIP4Config *config, int idx, const char *address_str, int plen, const char *gateway_str)
{
NMIP4Address *ip4 = nm_setting_ip4_config_get_address (config, index);
NMIP4Address *ip4 = nm_setting_ip4_config_get_address (config, idx);
struct in_addr address;
struct in_addr gateway;
@ -66,9 +66,9 @@ check_ip4_address (NMSettingIP4Config *config, int index, const char *address_st
}
static void
check_ip6_address (NMSettingIP6Config *config, int index, const char *address_str, int plen, const char *gateway_str)
check_ip6_address (NMSettingIP6Config *config, int idx, const char *address_str, int plen, const char *gateway_str)
{
NMIP6Address *ip6 = nm_setting_ip6_config_get_address (config, index);
NMIP6Address *ip6 = nm_setting_ip6_config_get_address (config, idx);
struct in6_addr address;
struct in6_addr gateway;
@ -82,10 +82,10 @@ check_ip6_address (NMSettingIP6Config *config, int index, const char *address_st
}
static void
check_ip4_route (NMSettingIP4Config *config, int index, const char *destination_str, int plen,
check_ip4_route (NMSettingIP4Config *config, int idx, const char *destination_str, int plen,
const char *nexthop_str, int metric)
{
NMIP4Route *route = nm_setting_ip4_config_get_route (config, index);
NMIP4Route *route = nm_setting_ip4_config_get_route (config, idx);
struct in_addr destination;
struct in_addr nexthop;
@ -100,10 +100,10 @@ check_ip4_route (NMSettingIP4Config *config, int index, const char *destination_
}
static void
check_ip6_route (NMSettingIP6Config *config, int index, const char *destination_str, int plen,
check_ip6_route (NMSettingIP6Config *config, int idx, const char *destination_str, int plen,
const char *next_hop_str, int metric)
{
NMIP6Route *route = nm_setting_ip6_config_get_route (config, index);
NMIP6Route *route = nm_setting_ip6_config_get_route (config, idx);
struct in6_addr destination;
struct in6_addr next_hop;