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

policy: don't check for valid error in active_connection_keep_alive_changed()

Browse source 
Most (not all) functions that can fail and report the reason with
an GError are required to set the error if they fail. It's a bug
to claim to fail without returning the GError reason.

Hence, our callers usually don't check whether a GError is present but
just access it.

Likewise, for better or worse, our GError codes are often not meaningful
(unless explicitly documented). Meaning, logging the error code number
is not helpful. Instead, error messages should be written in a manner
that one can find the source code location where it happened.

Also, return-early to reduce the indentation level of the code.

Also, drop the code comment. It seems to just describe what is obviously
visible by reading the source. It doesn't explain much beside that the
"doesn't have a reason", but not really why.
This commit is contained in:
Thomas Haller 2018-11-17 13:35:02 +01:00
parent 6b79af28d6
commit f10f019982
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nm-policy.c
View file

@ -2190,22 +2190,20 @@ active_connection_keep_alive_changed (NMActiveConnection *ac,
NMPolicyPrivate *priv = NM_POLICY_GET_PRIVATE (self);
GError *error = NULL;
/* The connection does not have a reason to stay alive anymore. */
if (!nm_active_connection_get_keep_alive (ac)) {
if (nm_active_connection_get_state (ac) <= NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
if (!nm_manager_deactivate_connection (priv->manager,
ac,
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED,
&error)) {
_LOGW (LOGD_DEVICE, "connection '%s' is no longer kept alive, but error deactivating it: (%d) %s",
nm_active_connection_get_settings_connection_id (ac),
error ? error->code : -1,
error ? error->message : "(unknown)");
g_clear_error (&error);
}
if (nm_active_connection_get_keep_alive (ac))
return;
if (nm_active_connection_get_state (ac) <= NM_ACTIVE_CONNECTION_STATE_ACTIVATED) {
if (!nm_manager_deactivate_connection (priv->manager,
ac,
NM_DEVICE_STATE_REASON_CONNECTION_REMOVED,
&error)) {
_LOGW (LOGD_DEVICE, "connection '%s' is no longer kept alive, but error deactivating it: %s",
nm_active_connection_get_settings_connection_id (ac),
error->message);
g_clear_error (&error);
}
}
}
static void