device: make some asserts less harsh

We're terrible programmers, but we don't need anyone to notice!
This commit is contained in:
Lubomir Rintel 2016-11-09 13:06:11 +01:00
parent 90beb7689a
commit c2ceacb419

View file

@ -9069,10 +9069,10 @@ nm_device_start_ip_check (NMDevice *self)
* first IP method completes. Any subsequently completing IP method doesn't
* get checked.
*/
g_assert (!priv->gw_ping.watch);
g_assert (!priv->gw_ping.timeout);
g_assert (!priv->gw_ping.pid);
g_assert (priv->ip4_state == IP_DONE || priv->ip6_state == IP_DONE);
g_return_if_fail (!priv->gw_ping.watch);
g_return_if_fail (!priv->gw_ping.timeout);
g_return_if_fail (!priv->gw_ping.pid);
g_return_if_fail (priv->ip4_state == IP_DONE || priv->ip6_state == IP_DONE);
connection = nm_device_get_applied_connection (self);
g_assert (connection);