diff options
| author | Michael Biebl <biebl@debian.org> | 2026-05-14 19:21:28 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2026-05-14 19:21:28 +0200 |
| commit | 4312005496b2f64293dd5a34fd81e4cba5a19c5b (patch) | |
| tree | 98c36475837c1f15559d4850a9a0368923fcee04 /src/libnm-core-impl/nm-setting-bridge.c | |
| parent | d877daadf2a7d90283a4b48a48fe854d1e9c78a6 (diff) | |
| parent | 869e9027026cdbb15d4e4a6327ff41d2697858eb (diff) | |
Update upstream source from tag 'upstream/1.56.1'
Update to upstream version '1.56.1' with Debian dir ea0a29e73fef8e57cffc45da43243a29de64bb9e
Diffstat (limited to 'src/libnm-core-impl/nm-setting-bridge.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-bridge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libnm-core-impl/nm-setting-bridge.c b/src/libnm-core-impl/nm-setting-bridge.c index c1618434..21457412 100644 --- a/src/libnm-core-impl/nm-setting-bridge.c +++ b/src/libnm-core-impl/nm-setting-bridge.c @@ -472,17 +472,17 @@ nm_bridge_vlan_to_str(const NMBridgeVlan *vlan, GError **error) NMBridgeVlan * nm_bridge_vlan_from_str(const char *str, GError **error) { - NMBridgeVlan *vlan = NULL; - gs_free const char **tokens = NULL; - guint i, vid_start, vid_end = 0; - gboolean pvid = FALSE; - gboolean untagged = FALSE; - char *c; + NMBridgeVlan *vlan = NULL; + gs_free char **tokens = NULL; + guint i, vid_start, vid_end = 0; + gboolean pvid = FALSE; + gboolean untagged = FALSE; + char *c; g_return_val_if_fail(str, NULL); g_return_val_if_fail(!error || !*error, NULL); - tokens = nm_utils_escaped_tokens_split(str, NM_ASCII_SPACES); + tokens = (char **) nm_utils_escaped_tokens_split(str, NM_ASCII_SPACES); if (!tokens || !tokens[0]) { g_set_error_literal(error, NM_CONNECTION_ERROR, |