Skip to content

Commit

Permalink
Merge pull request #119 from ssahani/decrease-scope
Browse files Browse the repository at this point in the history 
Treewide lower the scope of variables
  • Loading branch information
@ssahani
ssahani authored Feb 2, 2022
2 parents 1170b3c + 4280009 commit e39dd0d
Show file tree
Hide file tree
Showing 12 changed files with 51 additions and 87 deletions.
7 changes: 2 additions & 5 deletions src/cli/cli.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

int cli_manager_new(const Cli *cli_commands, CliManager **ret) {
_auto_cleanup_ CliManager *m = NULL;
size_t i;

assert(cli_commands);
assert(ret);
Expand All @@ -25,7 +24,7 @@ int cli_manager_new(const Cli *cli_commands, CliManager **ret) {
if (!m->hash)
return log_oom();

for (i = 0; cli_commands[i].name; i++)
for (size_t i = 0; cli_commands[i].name; i++)
g_hash_table_insert(m->hash, (gpointer *) cli_commands[i].name, (gpointer *) &cli_commands[i]);

*ret = steal_pointer(m);
Expand Down Expand Up @@ -62,9 +61,7 @@ int cli_run_command(const CliManager *m, int argc, char *argv[]) {

/* run default if no command specified */
if (!name) {
int i;

for (i = 0;; i++) {
for (size_t i = 0;; i++) {
if (m->commands[i].default_command)
command = m->commands;
remaining_argc = 1;
Expand Down
5 changes: 1 addition & 4 deletions src/dns/dns.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ int dns_domain_new(DNSDomain **ret) {
return -ENOMEM;

*ret = steal_pointer(a);

return 0;
}

Expand All @@ -141,7 +140,6 @@ int dns_domains_new(DNSDomains **ret) {
return -ENOMEM;

*ret = steal_pointer(h);

return 0;
}

Expand Down Expand Up @@ -199,7 +197,6 @@ int dns_read_resolv_conf(char ***dns, char ***domains) {

int add_dns_server_and_domain_to_resolv_conf(DNSServers *dns, char **domains) {
_auto_cleanup_strv_ char **dns_config = NULL, **domain_config = NULL;
GSequenceIter *i;
char **j;
int r;

Expand All @@ -208,7 +205,7 @@ int add_dns_server_and_domain_to_resolv_conf(DNSServers *dns, char **domains) {
return r;

if (dns) {
for (i = g_sequence_get_begin_iter(dns->dns_servers); !g_sequence_iter_is_end(i); i = g_sequence_iter_next(i)) {
for (GSequenceIter *i = g_sequence_get_begin_iter(dns->dns_servers); !g_sequence_iter_is_end(i); i = g_sequence_iter_next(i)) {
_auto_cleanup_ char *pretty = NULL;
DNSServer *d = g_sequence_get(i);

Expand Down
13 changes: 4 additions & 9 deletions src/dracut/dracut-parser.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ const char *dracut_dhcp_mode_to_name(int id) {
}

int dracut_dhcp_mode_to_mode(const char *name) {
int i;

assert(name);

for (i = DRACUT_DHCP_MODE_NONE; i < (int) ELEMENTSOF(dracut_dhcp_mode_table); i++)
for (size_t i = DRACUT_DHCP_MODE_NONE; i < (int) ELEMENTSOF(dracut_dhcp_mode_table); i++)
if (string_equal_fold(name, dracut_dhcp_mode_table[i]))
return i;

Expand All @@ -67,11 +65,9 @@ const char *dracut_to_networkd_dhcp_mode_to_name(int id) {
}

int dracut_to_networkd_dhcp_name_to_mode(const char *name) {
int i;

assert(name);

for (i = DRACUT_DHCP_MODE_NONE; i < (int) ELEMENTSOF(dracut_to_networkd_dhcp_mode_table); i++)
for (size_t i = DRACUT_DHCP_MODE_NONE; i < (int) ELEMENTSOF(dracut_to_networkd_dhcp_mode_table); i++)
if (string_equal_fold(name, dracut_to_networkd_dhcp_mode_table[i]))
return i;

Expand Down Expand Up @@ -123,8 +119,8 @@ static int dracut_parse_mac(char *mac, Network *n) {
*/
static int parse_command_line_ip_interface(const char *line, Network *n) {
_auto_cleanup_ IPAddress *peer = NULL, *prefix = NULL;
_auto_cleanup_ Address *a = NULL;
_auto_cleanup_strv_ char **s = NULL;
_auto_cleanup_ Address *a = NULL;
int r = 0;

s = strsplit(line, ":", 9);
Expand All @@ -145,7 +141,7 @@ static int dracut_parse_mac(char *mac, Network *n) {
a->peer = *peer;
}

a = NULL;
steal_pointer(a);

if (strv_length(s) >= 2 && !isempty_string(s[2])) {
r = parse_ip_from_string(s[2], &n->gateway);
Expand Down Expand Up @@ -431,6 +427,5 @@ int parse_proc_command_line(const char *cmd_line, GHashTable **ret) {
}

*ret = steal_pointer(networks);

return 0;
}
4 changes: 2 additions & 2 deletions src/lib-network/netlink/netlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ int rtnl_message_add_attribute_string(struct nlmsghdr *hdr, int type, const char
}

int rtnl_message_parse_rtattr(struct rtattr **tb, int max, struct rtattr *rta, int len) {
unsigned short type;

for (;RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
unsigned short type;

type = rta->rta_type & ~NLA_F_NESTED;

if ((type <= max) && (tb + type))
Expand Down
1 change: 0 additions & 1 deletion src/lib-network/networkd/networkd-api.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ static int network_parse_link_strv(int ifindex, const char *key, char ***ret) {
}

*ret = strsplit(s, " ", -1);

return r;
}

Expand Down
6 changes: 3 additions & 3 deletions src/manager/netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const char *netdev_kind_to_name(NetDevKind id) {
int netdev_name_to_kind(const char *name) {
assert(name);

for (int i = NET_DEV_KIND_VLAN; i < (int) ELEMENTSOF(netdev_kind); i++)
for (size_t i = NET_DEV_KIND_VLAN; i < (int) ELEMENTSOF(netdev_kind); i++)
if (netdev_kind[i] && string_equal_fold(name, netdev_kind[i]))
return i;

Expand Down Expand Up @@ -70,7 +70,7 @@ const char *bond_mode_to_name(BondMode id) {
int bond_name_to_mode(const char *name) {
assert(name);

for (int i = BOND_MODE_ROUNDROBIN; i < (int) ELEMENTSOF(bond_mode); i++)
for (size_t i = BOND_MODE_ROUNDROBIN; i < (int) ELEMENTSOF(bond_mode); i++)
if (bond_mode[i] && string_equal_fold(name, bond_mode[i]))
return i;

Expand Down Expand Up @@ -124,7 +124,7 @@ const char *ipvlan_mode_to_name(IPVLanMode id) {
int ipvlan_name_to_mode(const char *name) {
assert(name);

for (int i = IP_VLAN_MODE_L2; i < (int) ELEMENTSOF(ipvlan_mode); i++)
for (size_t i = IP_VLAN_MODE_L2; i < (int) ELEMENTSOF(ipvlan_mode); i++)
if (ipvlan_mode[i] && string_equal_fold(name, ipvlan_mode[i]))
return i;

Expand Down
5 changes: 1 addition & 4 deletions src/manager/network-address.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ static int addresses_new(Addresses **ret) {
return r;

*ret = steal_pointer(h);

return 0;
}

Expand All @@ -46,7 +45,6 @@ int address_new(Address **ret) {
return log_oom();

*ret = a;

return 0;
}

Expand Down Expand Up @@ -100,13 +98,12 @@ int address_add(Addresses **h, Address *a) {
static int fill_link_address(struct nlmsghdr *h, size_t len, int ifindex, Addresses **ret) {
_auto_cleanup_ Address *a = NULL;
struct ifaddrmsg *ifm;
struct nlmsghdr *p;
int r, l;

assert(h);
assert(ret);

for (p = h; NLMSG_OK(p, len); p = NLMSG_NEXT(p, len)) {
for (struct nlmsghdr *p = h; NLMSG_OK(p, len); p = NLMSG_NEXT(p, len)) {
_auto_cleanup_ struct rtattr **rta_tb = NULL;
ifm = NLMSG_DATA(p);

Expand Down
47 changes: 20 additions & 27 deletions src/manager/network-config-manager.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ static int list_links(int argc, char *argv[]) {
ansi_color_header_reset());

g_list_foreach(h->links, display_links_info, NULL);

return 0;
}

Expand Down Expand Up @@ -368,7 +367,6 @@ static void list_link_routes(gpointer key, gpointer value, gpointer userdata) {
first = false;
} else
printf(" %-30s on link %s%s%s \n", c, ansi_color_bold_blue(), buf, ansi_color_reset());

}

_public_ int ncm_system_status(int argc, char *argv[]) {
Expand Down Expand Up @@ -517,7 +515,6 @@ _public_ int ncm_link_get_mtu(const char *ifname, uint32_t *ret) {
return r;

*ret = mtu;

return 0;
}

Expand Down Expand Up @@ -2134,7 +2131,6 @@ _public_ int ncm_show_dns_server(int argc, char *argv[]) {
_public_ int ncm_get_dns_server(char ***ret) {
_cleanup_(dns_servers_freep) DNSServers *dns = NULL;
_auto_cleanup_strv_ char **s = NULL;
GSequenceIter *i;
DNSServer *d;

int r;
Expand All @@ -2145,7 +2141,7 @@ _public_ int ncm_get_dns_server(char ***ret) {
if (r < 0)
return r;

for (i = g_sequence_get_begin_iter(dns->dns_servers); !g_sequence_iter_is_end(i); i = g_sequence_iter_next(i)) {
for (GSequenceIter *i = g_sequence_get_begin_iter(dns->dns_servers); !g_sequence_iter_is_end(i); i = g_sequence_iter_next(i)) {
_auto_cleanup_ char *k = NULL;

d = g_sequence_get(i);
Expand Down Expand Up @@ -2177,7 +2173,7 @@ _public_ int ncm_add_dns_server(int argc, char *argv[]) {
_cleanup_(dns_servers_freep) DNSServers *dns = NULL;
_auto_cleanup_ IfNameIndex *p = NULL;
bool system = false, global = false;
int r, i;
int r;

if (string_equal(argv[1], "system"))
system = true;
Expand All @@ -2191,7 +2187,7 @@ _public_ int ncm_add_dns_server(int argc, char *argv[]) {
}
}

for (i = 2; i < argc; i++) {
for (int i = 2; i < argc; i++) {
_auto_cleanup_ IPAddress *a = NULL;
_auto_cleanup_ DNSServer *s = NULL;

Expand Down Expand Up @@ -2395,7 +2391,6 @@ _public_ int ncm_show_dns_server_domains(int argc, char *argv[]) {
_public_ int ncm_get_dns_domains(char ***ret) {
_cleanup_(dns_domains_freep) DNSDomains *domains = NULL;
_auto_cleanup_strv_ char **s = NULL;
GSequenceIter *i;
int r;

assert(ret);
Expand All @@ -2407,7 +2402,7 @@ _public_ int ncm_get_dns_domains(char ***ret) {
if (!domains || g_sequence_is_empty(domains->dns_domains))
return -ENODATA;
else
for (i = g_sequence_get_begin_iter(domains->dns_domains); !g_sequence_iter_is_end(i); i = g_sequence_iter_next(i)) {
for (GSequenceIter *i = g_sequence_get_begin_iter(domains->dns_domains); !g_sequence_iter_is_end(i); i = g_sequence_iter_next(i)) {
_auto_cleanup_ char *k = NULL;
DNSDomain *d;

Expand Down Expand Up @@ -2685,9 +2680,9 @@ _public_ int ncm_create_macvlan(int argc, char *argv[]) {
_auto_cleanup_ IfNameIndex *p = NULL;
bool have_mode = false;
MACVLanMode mode;
int r, i;
int r;

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "dev") || string_equal(argv[i], "device") || string_equal(argv[i], "link")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -2741,9 +2736,9 @@ _public_ int ncm_create_ipvlan(int argc, char *argv[]) {
_auto_cleanup_ IfNameIndex *p = NULL;
bool have_mode = false;
IPVLanMode mode;
int r, i;
int r;

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "dev") || string_equal(argv[i], "device") || string_equal(argv[i], "link")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -2799,9 +2794,9 @@ _public_ int ncm_create_vxlan(int argc, char *argv[]) {
_auto_cleanup_ IfNameIndex *p = NULL;
uint16_t port;
uint32_t vni;
int r, i;
int r;

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "dev") || string_equal(argv[i], "device") || string_equal(argv[i], "link")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -2912,9 +2907,9 @@ _public_ int ncm_create_vlan(int argc, char *argv[]) {
_auto_cleanup_ IfNameIndex *p = NULL;
_auto_cleanup_ char *proto = NULL;
uint16_t id;
int r = 0, i;
int r = 0;

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "dev") || string_equal(argv[i], "device") || string_equal(argv[i], "link")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -3021,9 +3016,9 @@ _public_ int ncm_remove_netdev(int argc, char *argv[]) {

_public_ int ncm_create_veth(int argc, char *argv[]) {
_auto_cleanup_ char *peer = NULL;
int r, i;
int r;

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "peer")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -3075,8 +3070,8 @@ _public_ int ncm_create_tunnel(int argc, char *argv[]) {
_auto_cleanup_ IfNameIndex *p = NULL;
bool independent = false;
NetDevKind kind;
int r, i;
char *c;
int r;

c = strchr(argv[0], '-');
kind = netdev_name_to_kind(++c);
Expand All @@ -3085,7 +3080,7 @@ _public_ int ncm_create_tunnel(int argc, char *argv[]) {
return -EINVAL;
}

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "dev") || string_equal(argv[i], "device") || string_equal(argv[i], "link")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -3150,9 +3145,9 @@ _public_ int ncm_create_wireguard_tunnel(int argc, char *argv[]) {
_auto_cleanup_ char *private_key = NULL, *public_key = NULL, *preshared_key = NULL, *endpoint = NULL, *allowed_ips = NULL;
bool have_private_key = false, have_public_key = false;
uint16_t listen_port;
int r, i;
int r;

for (i = 1; i < argc; i++) {
for (int i = 1; i < argc; i++) {
if (string_equal(argv[i], "private-key")) {
parse_next_arg(argv, argc, i);

Expand Down Expand Up @@ -3602,7 +3597,6 @@ _public_ int ncm_nft_get_tables(const char *family, const char *table, char ***r
_cleanup_(g_ptr_array_unrefp) GPtrArray *s = NULL;
_auto_cleanup_strv_ char **p = NULL;
int r, f = AF_UNSPEC;
guint i;

if (family) {
f = nft_family_name_to_type(family);
Expand All @@ -3614,7 +3608,7 @@ _public_ int ncm_nft_get_tables(const char *family, const char *table, char ***r
if (r < 0)
return r;

for (i = 0; i < s->len; i++) {
for (guint i = 0; i < s->len; i++) {
_cleanup_(g_string_unrefp) GString *v = NULL;
NFTNLTable *t = g_ptr_array_index(s, i);
_auto_cleanup_ char *a = NULL;
Expand Down Expand Up @@ -3734,7 +3728,6 @@ _public_ int ncm_nft_get_chains(char *family, const char *table, const char *cha
_cleanup_(g_ptr_array_unrefp) GPtrArray *s = NULL;
_auto_cleanup_strv_ char **p = NULL;
int r, f = AF_UNSPEC;
guint i;

if (family) {
f = nft_family_name_to_type(family);
Expand All @@ -3746,7 +3739,7 @@ _public_ int ncm_nft_get_chains(char *family, const char *table, const char *cha
if (r < 0)
return r;

for (i = 0; i < s->len; i++) {
for (guint i = 0; i < s->len; i++) {
_cleanup_(g_string_unrefp) GString *v = NULL;
NFTNLChain *c= g_ptr_array_index(s, i);
_auto_cleanup_ char *a = NULL;
Expand Down
Loading

0 comments on commit e39dd0d

Please sign in to comment.