summaryrefslogtreecommitdiff
path: root/src/core/dhcp/nm-dhcp-manager.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/dhcp/nm-dhcp-manager.c')
-rw-r--r--src/core/dhcp/nm-dhcp-manager.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index 44b8ede2c0..d6393eb127 100644
--- a/src/core/dhcp/nm-dhcp-manager.c
+++ b/src/core/dhcp/nm-dhcp-manager.c
@@ -63,9 +63,9 @@ _client_factory_find_by_name(const char *name)
{
int i;
- g_return_val_if_fail(name, NULL);
+ nm_assert(name);
- for (i = 0; i < G_N_ELEMENTS(_nm_dhcp_manager_factories); i++) {
+ for (i = 0; i < (int) G_N_ELEMENTS(_nm_dhcp_manager_factories); i++) {
const NMDhcpClientFactory *f = _nm_dhcp_manager_factories[i];
if (f && nm_streq(f->name, name))
@@ -598,7 +598,7 @@ nm_dhcp_manager_init(NMDhcpManager *self)
c_list_init(&priv->dhcp_client_lst_head);
- for (i = 0; i < G_N_ELEMENTS(_nm_dhcp_manager_factories); i++) {
+ for (i = 0; i < (int) G_N_ELEMENTS(_nm_dhcp_manager_factories); i++) {
const NMDhcpClientFactory *f = _nm_dhcp_manager_factories[i];
if (!f)
@@ -644,7 +644,7 @@ nm_dhcp_manager_init(NMDhcpManager *self)
}
}
if (!client_factory) {
- for (i = 0; i < G_N_ELEMENTS(_nm_dhcp_manager_factories); i++) {
+ for (i = 0; i < (int) G_N_ELEMENTS(_nm_dhcp_manager_factories); i++) {
client_factory = _client_factory_available(_nm_dhcp_manager_factories[i]);
if (client_factory)
break;