From 9adbc05e1b035bdee3cacd66f4861ae4993bfa60 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 18 Feb 2015 08:40:11 -0600 Subject: supplicant: remove unused nm-call-store.c/.h --- src/Makefile.am | 2 - src/supplicant-manager/nm-call-store.c | 119 ----------------------- src/supplicant-manager/nm-call-store.h | 41 -------- src/supplicant-manager/nm-supplicant-interface.c | 1 - 4 files changed, 163 deletions(-) delete mode 100644 src/supplicant-manager/nm-call-store.c delete mode 100644 src/supplicant-manager/nm-call-store.h diff --git a/src/Makefile.am b/src/Makefile.am index ead105de4a..64aa9dd485 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -275,8 +275,6 @@ nm_sources = \ supplicant-manager/nm-supplicant-settings-verify.c \ supplicant-manager/nm-supplicant-settings-verify.h \ supplicant-manager/nm-supplicant-types.h \ - supplicant-manager/nm-call-store.c \ - supplicant-manager/nm-call-store.h \ \ vpn-manager/nm-vpn-connection.c \ vpn-manager/nm-vpn-connection.h \ diff --git a/src/supplicant-manager/nm-call-store.c b/src/supplicant-manager/nm-call-store.c deleted file mode 100644 index 6e910a96b4..0000000000 --- a/src/supplicant-manager/nm-call-store.c +++ /dev/null @@ -1,119 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Copyright (C) 2007 Novell, Inc. - * Copyright (C) 2010 Red Hat, Inc. - */ - -#include "config.h" - -#include "nm-call-store.h" -#include "nm-logging.h" - -NMCallStore * -nm_call_store_new (void) -{ - /* Maps { DBusGProxy :: GHashTable { DBusGProxyCall :: NULL } } */ - return g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) g_hash_table_destroy); -} - -static void -proxy_destroyed_cb (gpointer data, GObject *proxy) -{ - g_hash_table_remove ((NMCallStore *) data, proxy); -} - -void -nm_call_store_add (NMCallStore *store, - DBusGProxy *proxy, - DBusGProxyCall *call) -{ - GHashTable *calls; - - g_return_if_fail (store != NULL); - g_return_if_fail (proxy != NULL); - - if (!call) { - /* Allow calling nm_call_store_add() with NULL @call for convenience. - * This way you can pass the result of dbus_g_proxy_begin_call() directly - * to nm_call_store_add() without checking for NULL. */ - return; - } - - calls = g_hash_table_lookup (store, proxy); - if (!calls) { - calls = g_hash_table_new (NULL, NULL); - g_hash_table_insert (store, proxy, calls); - g_object_weak_ref (G_OBJECT (proxy), proxy_destroyed_cb, store); - } - - g_hash_table_add (calls, call); -} - -void -nm_call_store_remove (NMCallStore *store, - DBusGProxy *proxy, - DBusGProxyCall *call) -{ - GHashTable *calls; - - g_return_if_fail (store != NULL); - g_return_if_fail (proxy != NULL); - g_return_if_fail (call != NULL); - - calls = g_hash_table_lookup (store, proxy); - if (!calls) - return; - - g_hash_table_remove (calls, call); - if (g_hash_table_size (calls) == 0) { - g_hash_table_remove (store, proxy); - g_object_weak_unref (G_OBJECT (proxy), proxy_destroyed_cb, store); - } -} - -void -nm_call_store_clear (NMCallStore *store) -{ - DBusGProxy *proxy; - GHashTable *calls; - GHashTableIter proxies_iter; - - g_return_if_fail (store != NULL); - - g_hash_table_iter_init (&proxies_iter, store); - while (g_hash_table_iter_next (&proxies_iter, (gpointer) &proxy, (gpointer) &calls)) { - GHashTableIter calls_iter; - DBusGProxyCall *call; - - g_hash_table_iter_init (&calls_iter, calls); - while (g_hash_table_iter_next (&calls_iter, (gpointer) &call, NULL)) { - dbus_g_proxy_cancel_call (proxy, call); - g_hash_table_iter_remove (&calls_iter); - } - g_object_weak_unref (G_OBJECT (proxy), proxy_destroyed_cb, store); - g_hash_table_iter_remove (&proxies_iter); - } - g_assert_cmpint (g_hash_table_size (store), ==, 0); -} - -void -nm_call_store_destroy (NMCallStore *store) -{ - g_return_if_fail (store); - g_hash_table_destroy (store); -} diff --git a/src/supplicant-manager/nm-call-store.h b/src/supplicant-manager/nm-call-store.h deleted file mode 100644 index bcee54cfbb..0000000000 --- a/src/supplicant-manager/nm-call-store.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ -/* NetworkManager -- Network link manager - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * (C) Copyright 2007 Novell, Inc. - */ - -#ifndef __NETWORKMANAGER_CALLBACK_STORE_H__ -#define __NETWORKMANAGER_CALLBACK_STORE_H__ - -#include -#include - -typedef GHashTable NMCallStore; - -NMCallStore *nm_call_store_new (void); -void nm_call_store_add (NMCallStore *store, - DBusGProxy *proxy, - DBusGProxyCall *call); - -void nm_call_store_remove (NMCallStore *store, - DBusGProxy *proxy, - DBusGProxyCall *call); - -void nm_call_store_clear (NMCallStore *store); -void nm_call_store_destroy (NMCallStore *store); - -#endif /* __NETWORKMANAGER_CALLBACK_STORE_H__ */ diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c index c2555b2bae..77dfd4cabc 100644 --- a/src/supplicant-manager/nm-supplicant-interface.c +++ b/src/supplicant-manager/nm-supplicant-interface.c @@ -29,7 +29,6 @@ #include "nm-supplicant-interface.h" #include "nm-logging.h" #include "nm-supplicant-config.h" -#include "nm-call-store.h" #include "nm-glib-compat.h" #include "gsystem-local-alloc.h" #include "nm-core-internal.h" -- cgit v1.2.1