[geany/geany] 2f237c: Prefix the WIF* macros with SPAWN_ and add short doc comments
Dimitar Zhekov
git-noreply at xxxxx
Sun Jul 12 14:06:02 UTC 2015
Branch: refs/heads/master
Author: Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer: Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date: Sun, 12 Jul 2015 14:06:02 UTC
Commit: 2f237c91a104a8b8260047f5a7de9a265278a150
https://github.com/geany/geany/commit/2f237c91a104a8b8260047f5a7de9a265278a150
Log Message:
-----------
Prefix the WIF* macros with SPAWN_ and add short doc comments
Modified Paths:
--------------
src/build.c
src/search.c
src/spawn.c
src/spawn.h
src/tools.c
Modified: src/build.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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;
Modified: src/search.c
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -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).");
Modified: src/spawn.c
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -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);
}
Modified: src/spawn.h
9 lines changed, 6 insertions(+), 3 deletions(-)
===================================================================
@@ -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
Modified: src/tools.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -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,
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
More information about the Commits
mailing list