Update upstream source from tag 'upstream/1.32.12'

Update to upstream version '1.32.12'
with Debian dir 6fabefa95c7dcf83371a78eb2c47013a81ff8d86

1 files changed, 0 insertions, 76 deletions

diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
deleted file mode 100644
index dad48227..00000000
--- a/shared/nm-utils/nm-compat.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2017 Red Hat, Inc.
- */
-
-#include "libnm/nm-default-libnm.h"
-
-#include "nm-compat.h"
-
-/*****************************************************************************/
-
-static void
-_get_keys_cb(const char *key, const char *val, gpointer user_data)
-{
-    GPtrArray *a = user_data;
-
-    g_ptr_array_add(a, g_strdup(key));
-}
-
-static const char **
-_get_keys(NMSettingVpn *setting, gboolean is_secrets, guint *out_length)
-{
-    guint        len;
-    const char **keys = NULL;
-    GPtrArray *  a;
-
-    nm_assert(NM_IS_SETTING_VPN(setting));
-
-    if (is_secrets)
-        len = nm_setting_vpn_get_num_secrets(setting);
-    else
-        len = nm_setting_vpn_get_num_data_items(setting);
-
-    a = g_ptr_array_sized_new(len + 1);
-
-    if (is_secrets)
-        nm_setting_vpn_foreach_secret(setting, _get_keys_cb, a);
-    else
-        nm_setting_vpn_foreach_data_item(setting, _get_keys_cb, a);
-
-    len = a->len;
-    if (len) {
-        g_ptr_array_sort(a, nm_strcmp_p);
-        g_ptr_array_add(a, NULL);
-        keys = g_malloc(a->len * sizeof(gpointer));
-        memcpy(keys, a->pdata, a->len * sizeof(gpointer));
-
-        /* we need to cache the keys *somewhere*. */
-        g_object_set_qdata_full(G_OBJECT(setting),
-                                is_secrets
-                                    ? NM_CACHED_QUARK("libnm._nm_setting_vpn_get_secret_keys")
-                                    : NM_CACHED_QUARK("libnm._nm_setting_vpn_get_data_keys"),
-                                g_ptr_array_free(a, FALSE),
-                                (GDestroyNotify) g_strfreev);
-    } else
-        g_ptr_array_free(a, TRUE);
-
-    NM_SET_OUT(out_length, len);
-    return keys;
-}
-
-const char **
-_nm_setting_vpn_get_data_keys(NMSettingVpn *setting, guint *out_length)
-{
-    g_return_val_if_fail(NM_IS_SETTING_VPN(setting), NULL);
-
-    return _get_keys(setting, FALSE, out_length);
-}
-
-const char **
-_nm_setting_vpn_get_secret_keys(NMSettingVpn *setting, guint *out_length)
-{
-    g_return_val_if_fail(NM_IS_SETTING_VPN(setting), NULL);
-
-    return _get_keys(setting, TRUE, out_length);
-}