koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill_nagbar: No need for pointer to pid_t

Browse Source
This commit is contained in:
Orestis Floros
2020-05-24 12:43:56 +02:00
parent 9aa28f357f
commit 6e087d4a20
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/util.h
View File

@ -143,13 +143,13 @@ char *pango_escape_markup(char *input);
void start_nagbar(pid_t *nagbar_pid, char *argv[]); void start_nagbar(pid_t *nagbar_pid, char *argv[]);
/** /**
* Kills the i3-nagbar process, if *nagbar_pid != -1. * Kills the i3-nagbar process, if nagbar_pid != -1.
* *
* If wait_for_it is set (restarting i3), this function will waitpid(), * If wait_for_it is set (restarting i3), this function will waitpid(),
* otherwise, ev is assumed to handle it (reloading). * otherwise, ev is assumed to handle it (reloading).
* *
*/ */
void kill_nagbar(pid_t *nagbar_pid, bool wait_for_it); void kill_nagbar(pid_t nagbar_pid, bool wait_for_it);
/** /**
* Converts a string into a long using strtol(). * Converts a string into a long using strtol().

4
src/commands.c
View File

@ -1615,8 +1615,8 @@ void cmd_exit(I3_CMD) {
*/ */
void cmd_reload(I3_CMD) { void cmd_reload(I3_CMD) {
LOG("reloading\n"); LOG("reloading\n");
kill_nagbar(&config_error_nagbar_pid, false); kill_nagbar(config_error_nagbar_pid, false);
kill_nagbar(&command_error_nagbar_pid, false); kill_nagbar(command_error_nagbar_pid, false);
load_configuration(NULL, C_RELOAD); load_configuration(NULL, C_RELOAD);
x_set_i3_atoms(); x_set_i3_atoms();
/* Send an IPC event just in case the ws names have changed */ /* Send an IPC event just in case the ws names have changed */

14
src/util.c
View File

@ -287,8 +287,8 @@ static char *store_restart_layout(void) {
void i3_restart(bool forget_layout) { void i3_restart(bool forget_layout) {
char *restart_filename = forget_layout ? NULL : store_restart_layout(); char *restart_filename = forget_layout ? NULL : store_restart_layout();
kill_nagbar(&config_error_nagbar_pid, true); kill_nagbar(config_error_nagbar_pid, true);
kill_nagbar(&command_error_nagbar_pid, true); kill_nagbar(command_error_nagbar_pid, true);
restore_geometry(); restore_geometry();
@ -405,17 +405,17 @@ void start_nagbar(pid_t *nagbar_pid, char *argv[]) {
} }
/* /*
* Kills the i3-nagbar process, if *nagbar_pid != -1. * Kills the i3-nagbar process, if nagbar_pid != -1.
* *
* If wait_for_it is set (restarting i3), this function will waitpid(), * If wait_for_it is set (restarting i3), this function will waitpid(),
* otherwise, ev is assumed to handle it (reloading). * otherwise, ev is assumed to handle it (reloading).
* *
*/ */
void kill_nagbar(pid_t *nagbar_pid, bool wait_for_it) { void kill_nagbar(pid_t nagbar_pid, bool wait_for_it) {
if (*nagbar_pid == -1) if (nagbar_pid == -1)
return; return;
if (kill(*nagbar_pid, SIGTERM) == -1) if (kill(nagbar_pid, SIGTERM) == -1)
warn("kill(configerror_nagbar) failed"); warn("kill(configerror_nagbar) failed");
if (!wait_for_it) if (!wait_for_it)
@ -425,7 +425,7 @@ void kill_nagbar(pid_t *nagbar_pid, bool wait_for_it) {
* exec(), our old pid is no longer watched. So, ev won’t handle SIGCHLD * exec(), our old pid is no longer watched. So, ev won’t handle SIGCHLD
* for us and we would end up with a <defunct> process. Therefore we * for us and we would end up with a <defunct> process. Therefore we
* waitpid() here. */ * waitpid() here. */
waitpid(*nagbar_pid, NULL, 0); waitpid(nagbar_pid, NULL, 0);
} }
/* /*