From a4cadf78faabc157e5db00e42302d495bba432c0 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 7 Jul 2020 13:53:30 +0200 Subject: Revert "Apply coding style" This reverts commit 9b55f2dec0ea27a9ce4856e303425e12f866cea2. Sorting the includes creates some problems. --- src/plugins/disco.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'src/plugins/disco.c') diff --git a/src/plugins/disco.c b/src/plugins/disco.c index 4bbc3d4b..af0823f5 100644 --- a/src/plugins/disco.c +++ b/src/plugins/disco.c @@ -33,25 +33,25 @@ * */ -#include #include +#include #include // features to reference count map -static GHashTable* features = NULL; +static GHashTable *features = NULL; // plugin to feature map -static GHashTable* plugin_to_features = NULL; +static GHashTable *plugin_to_features = NULL; static void -_free_features(GHashTable* features) +_free_features(GHashTable *features) { g_hash_table_destroy(features); } void -disco_add_feature(const char* plugin_name, char* feature) +disco_add_feature(const char *plugin_name, char *feature) { if (feature == NULL || plugin_name == NULL) { return; @@ -64,7 +64,7 @@ disco_add_feature(const char* plugin_name, char* feature) plugin_to_features = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_free_features); } - GHashTable* plugin_features = g_hash_table_lookup(plugin_to_features, plugin_name); + GHashTable *plugin_features = g_hash_table_lookup(plugin_to_features, plugin_name); gboolean added = FALSE; if (plugin_features == NULL) { plugin_features = g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL); @@ -83,7 +83,7 @@ disco_add_feature(const char* plugin_name, char* feature) if (!g_hash_table_contains(features, feature)) { g_hash_table_insert(features, strdup(feature), GINT_TO_POINTER(1)); } else { - void* refcountp = g_hash_table_lookup(features, feature); + void *refcountp = g_hash_table_lookup(features, feature); int refcount = GPOINTER_TO_INT(refcountp); refcount++; g_hash_table_replace(features, strdup(feature), GINT_TO_POINTER(refcount)); @@ -91,7 +91,7 @@ disco_add_feature(const char* plugin_name, char* feature) } void -disco_remove_features(const char* plugin_name) +disco_remove_features(const char *plugin_name) { if (!features) { return; @@ -100,17 +100,17 @@ disco_remove_features(const char* plugin_name) return; } - GHashTable* plugin_features_set = g_hash_table_lookup(plugin_to_features, plugin_name); + GHashTable *plugin_features_set = g_hash_table_lookup(plugin_to_features, plugin_name); if (!plugin_features_set) { return; } - GList* plugin_feature_list = g_hash_table_get_keys(plugin_features_set); - GList* curr = plugin_feature_list; + GList *plugin_feature_list = g_hash_table_get_keys(plugin_features_set); + GList *curr = plugin_feature_list; while (curr) { - char* feature = curr->data; + char *feature = curr->data; if (g_hash_table_contains(features, feature)) { - void* refcountp = g_hash_table_lookup(features, feature); + void *refcountp = g_hash_table_lookup(features, feature); int refcount = GPOINTER_TO_INT(refcountp); if (refcount == 1) { g_hash_table_remove(features, feature); @@ -123,6 +123,7 @@ disco_remove_features(const char* plugin_name) curr = g_list_next(curr); } g_list_free(plugin_feature_list); + } GList* -- cgit 1.4.1-2-gfad0