From 1041572769566375e4a91dc27e7c95caf1129201 Mon Sep 17 00:00:00 2001 From: David Coppa Date: Tue, 26 Jan 2016 09:55:24 +0100 Subject: [PATCH] Remove commented-out code. --- src/commands.c | 96 -------------------------------------------------- 1 file changed, 96 deletions(-) diff --git a/src/commands.c b/src/commands.c index 482560b8..9f5af8c2 100644 --- a/src/commands.c +++ b/src/commands.c @@ -142,102 +142,6 @@ static Con *maybe_auto_back_and_forth_workspace(Con *workspace) { return workspace; } -// This code is commented out because we might recycle it for popping up error -// messages on parser errors. -#if 0 -static pid_t migration_pid = -1; - -/* - * Handler which will be called when we get a SIGCHLD for the nagbar, meaning - * it exited (or could not be started, depending on the exit code). - * - */ -static void nagbar_exited(EV_P_ ev_child *watcher, int revents) { - ev_child_stop(EV_A_ watcher); - if (!WIFEXITED(watcher->rstatus)) { - fprintf(stderr, "ERROR: i3-nagbar did not exit normally.\n"); - return; - } - - int exitcode = WEXITSTATUS(watcher->rstatus); - printf("i3-nagbar process exited with status %d\n", exitcode); - if (exitcode == 2) { - fprintf(stderr, "ERROR: i3-nagbar could not be found. Is it correctly installed on your system?\n"); - } - - migration_pid = -1; -} - -/* We need ev >= 4 for the following code. Since it is not *that* important (it - * only makes sure that there are no i3-nagbar instances left behind) we still - * support old systems with libev 3. */ -#if EV_VERSION_MAJOR >= 4 -/* - * Cleanup handler. Will be called when i3 exits. Kills i3-nagbar with signal - * SIGKILL (9) to make sure there are no left-over i3-nagbar processes. - * - */ -static void nagbar_cleanup(EV_P_ ev_cleanup *watcher, int revent) { - if (migration_pid != -1) { - LOG("Sending SIGKILL (9) to i3-nagbar with PID %d\n", migration_pid); - kill(migration_pid, SIGKILL); - } -} -#endif - -void cmd_MIGRATION_start_nagbar(void) { - if (migration_pid != -1) { - fprintf(stderr, "i3-nagbar already running.\n"); - return; - } - fprintf(stderr, "Starting i3-nagbar, command parsing differs from expected output.\n"); - ELOG("Please report this on IRC or in the bugtracker. Make sure to include the full debug level logfile:\n"); - ELOG("i3-dump-log | gzip -9c > /tmp/i3.log.gz\n"); - ELOG("FYI: Your i3 version is " I3_VERSION "\n"); - migration_pid = fork(); - if (migration_pid == -1) { - warn("Could not fork()"); - return; - } - - /* child */ - if (migration_pid == 0) { - char *pageraction; - sasprintf(&pageraction, "i3-sensible-terminal -e i3-sensible-pager \"%s\"", errorfilename); - char *argv[] = { - NULL, /* will be replaced by the executable path */ - "-t", - "error", - "-m", - "You found a parsing error. Please, please, please, report it!", - "-b", - "show errors", - pageraction, - NULL - }; - exec_i3_utility("i3-nagbar", argv); - } - - /* parent */ - /* install a child watcher */ - ev_child *child = smalloc(sizeof(ev_child)); - ev_child_init(child, &nagbar_exited, migration_pid, 0); - ev_child_start(main_loop, child); - -/* We need ev >= 4 for the following code. Since it is not *that* important (it - * only makes sure that there are no i3-nagbar instances left behind) we still - * support old systems with libev 3. */ -#if EV_VERSION_MAJOR >= 4 - /* install a cleanup watcher (will be called when i3 exits and i3-nagbar is - * still running) */ - ev_cleanup *cleanup = smalloc(sizeof(ev_cleanup)); - ev_cleanup_init(cleanup, nagbar_cleanup); - ev_cleanup_start(main_loop, cleanup); -#endif -} - -#endif - /******************************************************************************* * Criteria functions. ******************************************************************************/