From 15d1056c31566186ce37c634b380c4bc618a9891 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 10 May 2018 13:22:31 -0400 Subject: [PATCH] daemon: fix compiler warnings Right now we have code like: if (!refreshed_user || user_get_cached (user) && !user_get_cached (refreshed_user)) which gcc warns about because of missing parentheses. This commit fixes it by adding brackets. https://bugs.freedesktop.org/show_bug.cgi?id=106463 --- src/daemon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/daemon.c b/src/daemon.c index d443f11..e711a46 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -482,75 +482,75 @@ reload_users (Daemon *daemon) while (g_hash_table_iter_next (&iter, &name, (gpointer *)&user)) { if (!user_get_system_account (user)) number_of_normal_users++; user_update_local_account_property (user, g_hash_table_lookup (local, name) != NULL); } g_hash_table_destroy (local); had_no_users = accounts_accounts_get_has_no_users (accounts); has_no_users = number_of_normal_users == 0; if (had_no_users != has_no_users) accounts_accounts_set_has_no_users (accounts, has_no_users); had_multiple_users = accounts_accounts_get_has_multiple_users (accounts); has_multiple_users = number_of_normal_users > 1; if (had_multiple_users != has_multiple_users) accounts_accounts_set_has_multiple_users (accounts, has_multiple_users); /* Swap out the users */ old_users = daemon->priv->users; daemon->priv->users = users; /* Remove all the old users */ g_hash_table_iter_init (&iter, old_users); while (g_hash_table_iter_next (&iter, &name, (gpointer *)&user)) { User *refreshed_user; refreshed_user = g_hash_table_lookup (users, name); - if (!refreshed_user || user_get_cached (user) && !user_get_cached (refreshed_user)) { + if (!refreshed_user || (user_get_cached (user) && !user_get_cached (refreshed_user))) { accounts_accounts_emit_user_deleted (ACCOUNTS_ACCOUNTS (daemon), user_get_object_path (user)); user_unregister (user); } } /* Register all the new users */ g_hash_table_iter_init (&iter, users); while (g_hash_table_iter_next (&iter, &name, (gpointer *)&user)) { User *stale_user; stale_user = g_hash_table_lookup (old_users, name); - if (!stale_user || !user_get_cached (stale_user) && user_get_cached (user)) { + if (!stale_user || (!user_get_cached (stale_user) && user_get_cached (user))) { user_register (user); accounts_accounts_emit_user_added (ACCOUNTS_ACCOUNTS (daemon), user_get_object_path (user)); } g_object_thaw_notify (G_OBJECT (user)); } g_hash_table_destroy (old_users); } static gboolean reload_users_timeout (Daemon *daemon) { reload_users (daemon); daemon->priv->reload_id = 0; return FALSE; } static gboolean load_autologin (Daemon *daemon, gchar **name, gboolean *enabled, GError **error); static gboolean reload_autologin_timeout (Daemon *daemon) { AccountsAccounts *accounts = ACCOUNTS_ACCOUNTS (daemon); gboolean enabled; g_autofree gchar *name = NULL; -- 2.17.0