HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefix the WIF* macros with SPAWN_ and add short doc comments

Browse Source
This commit is contained in:
Dimitar Zhekov 2015-07-12 17:06:02 +03:00
parent f11a2eb013
commit 2f237c91a1
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/build.c
View File

@ -1042,7 +1042,7 @@ static void show_build_result_message(gboolean failure)
static void build_exit_cb(GPid child_pid, gint status, gpointer user_data)
{
show_build_result_message(!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS);
show_build_result_message(!SPAWN_WIFEXITED(status) || SPAWN_WEXITSTATUS(status) != EXIT_SUCCESS);
utils_beep();
build_info.pid = 0;

6
src/search.c
View File

@ -1849,11 +1849,11 @@ static void search_finished(GPid child_pid, gint status, gpointer user_data)
#ifdef G_OS_UNIX
gint exit_status = 1;
if (WIFEXITED(status))
if (SPAWN_WIFEXITED(status))
{
exit_status = WEXITSTATUS(status);
exit_status = SPAWN_WEXITSTATUS(status);
}
else if (WIFSIGNALED(status))
else if (SPAWN_WIFSIGNALED(status))
{
exit_status = -1;
g_warning("Find in Files: The command failed unexpectedly (signal received).");

4
src/spawn.c
View File

@ -1164,8 +1164,8 @@ static void print_status(gint status)
{
fputs("finished, ", stderr);
if (WIFEXITED(status))
fprintf(stderr, "exit code %d\n", WEXITSTATUS(status));
if (SPAWN_WIFEXITED(status))
fprintf(stderr, "exit code %d\n", SPAWN_WEXITSTATUS(status));
else
fputs("abnormal termination\n", stderr);
}

9
src/spawn.h
View File

@ -25,12 +25,15 @@
#include <glib.h>
#ifdef G_OS_WIN32
# define WIFEXITED(status) TRUE
# define WEXITSTATUS(status) (status)
# define WIFSIGNALED(status) FALSE
# define SPAWN_WIFEXITED(status) TRUE /**< non-zero if the child exited normally */
# define SPAWN_WEXITSTATUS(status) (status) /**< exit status of a child if exited normally */
# define SPAWN_WIFSIGNALED(status) FALSE /**< non-zero if the child exited due to signal */
#else
# include <sys/types.h>
# include <sys/wait.h>
# define SPAWN_WIFEXITED(status) WIFEXITED(status)
# define SPAWN_WEXITSTATUS(status) WEXITSTATUS(status)
# define SPAWN_WIFSIGNALED(status) WIFSIGNALED(status)
#endif
G_BEGIN_DECLS

2
src/tools.c
View File

@ -226,7 +226,7 @@ void tools_execute_custom_command(GeanyDocument *doc, const gchar *command)
"Your selection was not changed. Error message: %s"),
errors->str);
}
else if (!WIFEXITED(status) || WEXITSTATUS(status) != EXIT_SUCCESS)
else if (!SPAWN_WIFEXITED(status) || SPAWN_WEXITSTATUS(status) != EXIT_SUCCESS)
{
/* TODO maybe include the exit code in the error message */
ui_set_statusbar(TRUE,