[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: fix #4890
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: fix #4890 |
Date: |
Wed, 15 Feb 2017 15:36:14 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new bc82b006f fix #4890
bc82b006f is described below
commit bc82b006f1ef798c5b4578026c6cbdb597985426
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Feb 15 15:37:07 2017 +0100
fix #4890
---
src/arm/gnunet-arm.c | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index b6f4d99a8..65a6463cf 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -321,23 +321,21 @@ start_callback (void *cls,
enum GNUNET_ARM_RequestStatus rs,
enum GNUNET_ARM_Result result)
{
- char *msg;
-
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
{
- GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n"));
- FPRINTF (stdout, msg, req_string (rs));
- GNUNET_free (msg);
+ FPRINTF (stdout,
+ _("Failed to start the ARM service: %s\n"),
+ req_string (rs));
GNUNET_SCHEDULER_shutdown ();
return;
}
if ( (GNUNET_ARM_RESULT_STARTING != result) &&
(GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result) )
{
- GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n"));
- FPRINTF (stdout, msg, ret_string (result));
- GNUNET_free (msg);
+ FPRINTF (stdout,
+ _("Failed to start the ARM service: %s\n"),
+ ret_string (result));
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -417,28 +415,23 @@ init_callback (void *cls,
enum GNUNET_ARM_RequestStatus rs,
enum GNUNET_ARM_Result result)
{
- char *msg;
-
op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
{
- GNUNET_asprintf (&msg,
- _("Failed to send a request to start the `%s' service:
%%s\n"),
- init);
- FPRINTF (stdout, msg, req_string (rs));
- GNUNET_free (msg);
+ FPRINTF (stdout,
+ _("Failed to send a request to start the `%s' service: %s\n"),
+ init,
+ req_string (rs));
GNUNET_SCHEDULER_shutdown ();
return;
}
if ((GNUNET_ARM_RESULT_STARTING != result) &&
(GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result))
{
- GNUNET_asprintf (&msg,
- _("Failed to start the `%s' service: %s\n"),
- init,
- ret_string (result));
- FPRINTF (stdout, "%s", msg);
- GNUNET_free (msg);
+ FPRINTF (stdout,
+ _("Failed to start the `%s' service: %s\n"),
+ init,
+ ret_string (result));
GNUNET_SCHEDULER_shutdown ();
return;
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnunet] branch master updated: fix #4890,
gnunet <=