diff options
author | Ray Strode <halfline@gmail.com> | 2022-10-28 03:34:09 +0000 |
---|---|---|
committer | Ray Strode <halfline@gmail.com> | 2022-10-28 03:34:09 +0000 |
commit | c93e299386fde03be43dc3ba84646ab044ae9e70 (patch) | |
tree | 2f3e64509db42b76997b0658199e3308c7ababc6 | |
parent | ec13e620970fdbcf6f1e1b15ffbad85dc1ef1e02 (diff) | |
parent | 0eb597dd3b6e3b0deb431a37a8048164a793097a (diff) | |
download | gdm-c93e299386fde03be43dc3ba84646ab044ae9e70.tar.gz |
Merge branch 'wip/abono/scan-build' into 'main'
Address some scan-build warnings
See merge request GNOME/gdm!186
-rw-r--r-- | common/gdm-settings-direct.c | 5 | ||||
-rw-r--r-- | common/gdm-settings.c | 2 | ||||
-rw-r--r-- | daemon/gdm-display-access-file.c | 12 | ||||
-rw-r--r-- | daemon/gdm-display.c | 7 | ||||
-rw-r--r-- | daemon/gdm-session-worker-job.c | 2 | ||||
-rw-r--r-- | daemon/gdm-session-worker.c | 4 | ||||
-rw-r--r-- | libgdm/gdm-client.c | 2 | ||||
-rw-r--r-- | tests/m-common.c | 2 |
8 files changed, 14 insertions, 22 deletions
diff --git a/common/gdm-settings-direct.c b/common/gdm-settings-direct.c index d10699e2..c3653172 100644 --- a/common/gdm-settings-direct.c +++ b/common/gdm-settings-direct.c @@ -108,8 +108,6 @@ gdm_settings_direct_get_int (const char *key, assert_signature (entry, "i"); - ret = FALSE; - res = get_value (key, &str); if (! res) { @@ -131,7 +129,6 @@ gdm_settings_direct_get_uint (const char *key, gboolean ret; int intvalue; - ret = FALSE; ret = gdm_settings_direct_get_int (key, &intvalue); if (intvalue >= 0) @@ -158,8 +155,6 @@ gdm_settings_direct_get_boolean (const char *key, assert_signature (entry, "b"); - ret = FALSE; - res = get_value (key, &str); if (! res) { diff --git a/common/gdm-settings.c b/common/gdm-settings.c index 96c2f8d3..8ff33e43 100644 --- a/common/gdm-settings.c +++ b/common/gdm-settings.c @@ -83,6 +83,7 @@ gdm_settings_get_value (GdmSettings *settings, GList *l; g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE); + g_return_val_if_fail (settings->backends != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE); local_error = NULL; @@ -120,6 +121,7 @@ gdm_settings_set_value (GdmSettings *settings, GList *l; g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE); + g_return_val_if_fail (settings->backends != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE); g_debug ("Setting value %s", key); diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c index 217ebbb4..ed0a146d 100644 --- a/daemon/gdm-display-access-file.c +++ b/daemon/gdm-display-access-file.c @@ -278,7 +278,15 @@ _create_xauth_file_for_user (const char *username, } g_chmod (GDM_XAUTH_DIR, 0711); - _get_uid_and_gid_for_user (GDM_USERNAME, &uid, &gid); + if (!_get_uid_and_gid_for_user (GDM_USERNAME, &uid, &gid)) { + g_set_error (error, + GDM_DISPLAY_ERROR, + GDM_DISPLAY_ERROR_GETTING_USER_INFO, + _("Could not find user “%s” on system"), + GDM_USERNAME); + goto out; + } + if (chown (GDM_XAUTH_DIR, 0, gid) != 0) { g_warning ("Unable to change owner of '%s'", GDM_XAUTH_DIR); @@ -295,7 +303,7 @@ _create_xauth_file_for_user (const char *username, g_set_error (error, GDM_DISPLAY_ERROR, GDM_DISPLAY_ERROR_GETTING_USER_INFO, - _("could not find user “%s” on system"), + _("Could not find user “%s” on system"), username); goto out; diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c index 123cce4a..42762fd8 100644 --- a/daemon/gdm-display.c +++ b/daemon/gdm-display.c @@ -178,13 +178,9 @@ _create_access_file_for_user (GdmDisplay *self, GError **error) { GdmDisplayAccessFile *access_file; - GError *file_error; access_file = gdm_display_access_file_new (username); - - file_error = NULL; - if (!gdm_display_access_file_open (access_file, &file_error)) { - g_propagate_error (error, file_error); + if (!gdm_display_access_file_open (access_file, error)) { return NULL; } @@ -1881,7 +1877,6 @@ gdm_display_connect (GdmDisplay *self) gboolean ret; priv = gdm_display_get_instance_private (self); - ret = FALSE; g_debug ("GdmDisplay: Server is ready - opening display %s", priv->x11_display_name); diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c index f7452520..052df1d1 100644 --- a/daemon/gdm-session-worker-job.c +++ b/daemon/gdm-session-worker-job.c @@ -265,8 +265,6 @@ gdm_session_worker_job_spawn (GdmSessionWorkerJob *session_worker_job, GPtrArray *args; GPtrArray *env; - ret = FALSE; - g_debug ("GdmSessionWorkerJob: Running session_worker_job process: %s %s", name != NULL? name : "", session_worker_job->command); diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 12905171..88882380 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -690,7 +690,6 @@ gdm_session_worker_process_pam_message (GdmSessionWorker *worker, worker->timed_out = FALSE; user_answer = NULL; - res = FALSE; switch (query->msg_style) { case PAM_PROMPT_ECHO_ON: res = gdm_session_worker_ask_question (worker, utf8_msg, &user_answer); @@ -1158,6 +1157,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker, int error_code; char tty_string[256]; + g_assert (service != NULL); g_assert (worker->pam_handle == NULL); g_debug ("GdmSessionWorker: initializing PAM; service=%s username=%s seat=%s", @@ -1482,7 +1482,6 @@ _lookup_passwd_info (const char *username, ret = FALSE; aux_buffer = NULL; - aux_buffer_size = 0; required_aux_buffer_size = sysconf (_SC_GETPW_R_SIZE_MAX); @@ -2270,7 +2269,6 @@ set_xdg_vtnr_to_current_vt (GdmSessionWorker *worker) } close (fd); - fd = -1; g_snprintf (vt_string, sizeof (vt_string), "%d", vt_state.v_active); diff --git a/libgdm/gdm-client.c b/libgdm/gdm-client.c index fb58f1a4..12d4f8ec 100644 --- a/libgdm/gdm-client.c +++ b/libgdm/gdm-client.c @@ -96,11 +96,9 @@ on_got_manager (GObject *object, gpointer user_data) { g_autoptr(GTask) task = user_data; - g_autoptr(GdmClient) client = NULL; g_autoptr(GdmManager) manager = NULL; g_autoptr(GError) error = NULL; - client = GDM_CLIENT (g_async_result_get_source_object (G_ASYNC_RESULT (task))); manager = gdm_manager_proxy_new_finish (result, &error); if (error != NULL) { diff --git a/tests/m-common.c b/tests/m-common.c index 0c533d04..f4830b40 100644 --- a/tests/m-common.c +++ b/tests/m-common.c @@ -43,8 +43,6 @@ main (int argc, char **argv) int failed; GError *error; - failed = 0; - context = g_option_context_new (""); g_option_context_add_main_entries (context, entries, NULL); error = NULL; |