diff options
Diffstat (limited to 'tests/src/Xvnc.c')
| -rw-r--r-- | tests/src/Xvnc.c | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/tests/src/Xvnc.c b/tests/src/Xvnc.c index 9459c224..c63de81a 100644 --- a/tests/src/Xvnc.c +++ b/tests/src/Xvnc.c @@ -89,10 +89,8 @@ vnc_data_cb (GIOChannel *channel, GIOCondition condition, gpointer data) { gchar buffer[1024]; gsize n_read; - GIOStatus status; g_autoptr(GError) error = NULL; - - status = g_io_channel_read_chars (channel, buffer, 1023, &n_read, &error); + GIOStatus status = g_io_channel_read_chars (channel, buffer, 1023, &n_read, &error); if (error) g_warning ("Error reading from VNC client: %s", error->message); @@ -139,15 +137,6 @@ request_cb (const gchar *name, GHashTable *params) int main (int argc, char **argv) { - int i; - g_autofree gchar *pid_string = NULL; - gboolean use_inetd = FALSE; - gboolean has_option = FALSE; - const gchar *geometry = "640x480"; - gint depth = 8; - g_autofree gchar *lock_filename = NULL; - int lock_file; - #if !defined(GLIB_VERSION_2_36) g_type_init (); #endif @@ -158,7 +147,11 @@ main (int argc, char **argv) g_unix_signal_add (SIGTERM, sigterm_cb, NULL); g_unix_signal_add (SIGHUP, sighup_cb, NULL); - for (i = 1; i < argc; i++) + gboolean use_inetd = FALSE; + gboolean has_option = FALSE; + const gchar *geometry = "640x480"; + gint depth = 8; + for (int i = 1; i < argc; i++) { char *arg = argv[i]; @@ -236,32 +229,24 @@ main (int argc, char **argv) return EXIT_FAILURE; } - lock_filename = g_strdup_printf (".X%d-lock", display_number); + g_autofree gchar *lock_filename = g_strdup_printf (".X%d-lock", display_number); lock_path = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", lock_filename, NULL); - lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); + int lock_file = open (lock_path, O_CREAT | O_EXCL | O_WRONLY, 0444); if (lock_file < 0) { g_autofree gchar *lock_contents = NULL; - if (g_file_get_contents (lock_path, &lock_contents, NULL, NULL)) { - g_autofree gchar *proc_filename = NULL; - pid_t pid; - - pid = atol (lock_contents); + pid_t pid = atol (lock_contents); - proc_filename = g_strdup_printf ("/proc/%d", pid); + g_autofree gchar *proc_filename = g_strdup_printf ("/proc/%d", pid); if (!g_file_test (proc_filename, G_FILE_TEST_EXISTS)) { - g_autofree gchar *socket_dir = NULL; - g_autofree gchar *socket_filename = NULL; - g_autofree gchar *socket_path = NULL; - - socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL); + g_autofree gchar *socket_dir = g_build_filename (g_getenv ("LIGHTDM_TEST_ROOT"), "tmp", ".X11-unix", NULL); g_mkdir_with_parents (socket_dir, 0755); - socket_filename = g_strdup_printf ("X%d", display_number); - socket_path = g_build_filename (socket_dir, socket_filename, NULL); + g_autofree gchar *socket_filename = g_strdup_printf ("X%d", display_number); + g_autofree gchar *socket_path = g_build_filename (socket_dir, socket_filename, NULL); g_printerr ("Breaking lock on non-existant process %d\n", pid); unlink (lock_path); @@ -281,7 +266,7 @@ main (int argc, char **argv) g_clear_pointer (&lock_path, g_free); return EXIT_FAILURE; } - pid_string = g_strdup_printf ("%10ld", (long) getpid ()); + g_autofree gchar *pid_string = g_strdup_printf ("%10ld", (long) getpid ()); if (write (lock_file, pid_string, strlen (pid_string)) < 0) { g_warning ("Error writing PID file: %s", strerror (errno)); |