diff options
| author | Michael Biebl <biebl@debian.org> | 2019-08-06 22:47:09 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2019-08-06 22:47:09 +0200 |
| commit | 665270502c3d7c0d002ad76fefb1b7699794cd49 (patch) | |
| tree | 9bc6f4f79278c2a719e1839188f763655a6370ca /src/settings/nm-settings.c | |
| parent | 3192a21b21d4a9d276a7f2ef4e4b0fcf3165d9eb (diff) | |
| parent | 5c79b900b59a5ad162ecc836e424468207ff031e (diff) | |
Update upstream source from tag 'upstream/1.20.0'
Update to upstream version '1.20.0' with Debian dir 832bc2b5ac5f253004165f6354c938efbe172206
Diffstat (limited to 'src/settings/nm-settings.c')
| -rw-r--r-- | src/settings/nm-settings.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 430d2776..42a7bca0 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -1455,7 +1455,7 @@ _add_connection_to_first_plugin (NMSettings *self, GError **error) { NMSettingsPrivate *priv = NM_SETTINGS_GET_PRIVATE (self); - GError *first_error = NULL; + gs_free_error GError *first_error = NULL; GSList *iter; const char *uuid; @@ -1561,7 +1561,7 @@ _add_connection_to_first_plugin (NMSettings *self, } nm_assert (first_error); - g_propagate_error (error, first_error); + g_propagate_error (error, g_steal_pointer (&first_error)); return FALSE; } @@ -2866,7 +2866,7 @@ _clear_connections_cached_list (NMSettingsPrivate *priv) * it. That is a bug, this code just tries to make it blow up * more eagerly. */ memset (priv->connections_cached_list, - 0xdeaddead, + 0x43, sizeof (NMSettingsConnection *) * (priv->connections_len + 1)); #endif |