diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2019-08-23 18:25:23 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2019-09-05 12:13:36 +0200 |
| commit | ee20761ea897a097cf46fdb223c0e0f40b1fba91 (patch) | |
| tree | 25f08aee778c4c509cc27227b2130747db05161f | |
| parent | 89814d90aa33ccf214163faae7a7b15cc39f65bf (diff) | |
| download | NetworkManager-ee20761ea897a097cf46fdb223c0e0f40b1fba91.tar.gz | |
dhcp: prefer nm_assert() to g_assert*()
| -rw-r--r-- | src/dhcp/nm-dhcp-client.c | 2 | ||||
| -rw-r--r-- | src/dhcp/nm-dhcp-dhclient-utils.c | 2 | ||||
| -rw-r--r-- | src/dhcp/nm-dhcp-dhclient.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c index 9f585c5dc9..a134555b87 100644 --- a/src/dhcp/nm-dhcp-client.c +++ b/src/dhcp/nm-dhcp-client.c @@ -686,7 +686,7 @@ nm_dhcp_client_stop (NMDhcpClient *self, gboolean release) _LOGI ("canceled DHCP transaction, DHCP client pid %d", old_pid); else _LOGI ("canceled DHCP transaction"); - g_assert (priv->pid == -1); + nm_assert (priv->pid == -1); nm_dhcp_client_set_state (self, NM_DHCP_STATE_DONE, NULL, NULL); } diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index bf3df399b6..359779f19c 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -128,7 +128,7 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean guint i; p = g_bytes_get_data (client_id, &l); - g_assert (p); + nm_assert (p); /* Allow type 0 (non-hardware address) to be represented as a string * as long as all the characters are printable. diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 72ea3d48f8..fa142b4b5d 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -213,7 +213,7 @@ merge_dhclient_config (NMDhcpDhclient *self, orig_path, orig, out_new_client_id); - g_assert (new); + nm_assert (new); return g_file_set_contents (conf_file, new, |