[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27220 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27220 - gnunet/src/util |
Date: |
Tue, 21 May 2013 14:57:28 +0200 |
Author: grothoff
Date: 2013-05-21 14:57:28 +0200 (Tue, 21 May 2013)
New Revision: 27220
Modified:
gnunet/src/util/crypto_ecc.c
gnunet/src/util/helper.c
Log:
-handle case that we are in restart on stop
Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c 2013-05-21 12:48:22 UTC (rev 27219)
+++ gnunet/src/util/crypto_ecc.c 2013-05-21 12:57:28 UTC (rev 27220)
@@ -745,7 +745,8 @@
if (NULL != gc->filename)
{
- if (0 != UNLINK (gc->filename))
+ if ( (0 != UNLINK (gc->filename)) &&
+ (ENOENT != errno) )
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink",
gc->filename);
GNUNET_free (gc->filename);
}
Modified: gnunet/src/util/helper.c
===================================================================
--- gnunet/src/util/helper.c 2013-05-21 12:48:22 UTC (rev 27219)
+++ gnunet/src/util/helper.c 2013-05-21 12:57:28 UTC (rev 27220)
@@ -276,8 +276,16 @@
static void
stop_helper (struct GNUNET_HELPER_Handle *h, int soft_kill)
{
- GNUNET_break (GNUNET_OK == GNUNET_HELPER_kill (h, soft_kill));
- GNUNET_break (GNUNET_OK == GNUNET_HELPER_wait (h));
+ if (GNUNET_SCHEDULER_NO_TASK != h->restart_task)
+ {
+ GNUNET_SCHEDULER_cancel (h->restart_task);
+ h->restart_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ else
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_HELPER_kill (h, soft_kill));
+ GNUNET_break (GNUNET_OK == GNUNET_HELPER_wait (h));
+ }
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27220 - gnunet/src/util,
gnunet <=