[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31146 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31146 - gnunet/src/util |
Date: |
Fri, 6 Dec 2013 15:36:35 +0100 |
Author: wachs
Date: 2013-12-06 15:36:35 +0100 (Fri, 06 Dec 2013)
New Revision: 31146
Modified:
gnunet/src/util/gnunet-uri.c
Log:
gnunet-uri return handler exit code
Modified: gnunet/src/util/gnunet-uri.c
===================================================================
--- gnunet/src/util/gnunet-uri.c 2013-12-06 14:33:00 UTC (rev 31145)
+++ gnunet/src/util/gnunet-uri.c 2013-12-06 14:36:35 UTC (rev 31146)
@@ -26,11 +26,10 @@
#include "platform.h"
#include "gnunet_util_lib.h"
-
/**
- * Global return value.
+ * Handler exit code
*/
-static int ret = 1;
+static long unsigned int exit_code = 1;
/**
* Helper process we started.
@@ -54,14 +53,9 @@
maint_child_death (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
enum GNUNET_OS_ProcessStatusType type;
- unsigned long code;
-
- if ( (GNUNET_OK ==
- GNUNET_OS_process_status (p, &type, &code)) &&
- (type == GNUNET_OS_PROCESS_EXITED) &&
- (0 == code) )
- ret = 0;
- else
+ if ( (GNUNET_OK !=
+ GNUNET_OS_process_status (p, &type, &exit_code)) ||
+ (type != GNUNET_OS_PROCESS_EXITED) )
GNUNET_break (0 == GNUNET_OS_process_kill (p, GNUNET_TERM_SIG));
GNUNET_OS_process_destroy (p);
}
@@ -178,7 +172,7 @@
GNUNET_DISK_pipe_close (sigpipe);
sigpipe = NULL;
GNUNET_free ((void *) argv);
- return (GNUNET_OK == ret) ? 0 : 1;
+ return ((GNUNET_OK == ret) && (0 == exit_code)) ? 0 : 1;
}
/* end of gnunet-uri.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31146 - gnunet/src/util,
gnunet <=