[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated: remove dead enum values
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated: remove dead enum values |
Date: |
Wed, 08 Mar 2017 18:52:39 +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 95646a7b4 remove dead enum values
95646a7b4 is described below
commit 95646a7b495153841c53034abca516c9261b2fb7
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Mar 8 18:54:17 2017 +0100
remove dead enum values
---
src/arm/gnunet-arm.c | 8 +-------
src/include/gnunet_arm_service.h | 18 +-----------------
src/testbed/gnunet-service-testbed_peers.c | 6 ------
3 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 3c52137bc..49886eb56 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -220,14 +220,8 @@ req_string (enum GNUNET_ARM_RequestStatus rs)
{
case GNUNET_ARM_REQUEST_SENT_OK:
return _("Message was sent successfully");
- case GNUNET_ARM_REQUEST_CONFIGURATION_ERROR:
- return _("Misconfiguration (can not connect to the ARM service)");
case GNUNET_ARM_REQUEST_DISCONNECTED:
return _("We disconnected from ARM before we could send a request");
- case GNUNET_ARM_REQUEST_BUSY:
- return _("ARM API is busy");
- case GNUNET_ARM_REQUEST_TIMEOUT:
- return _("Request timed out");
}
return _("Unknown request status");
}
@@ -263,7 +257,7 @@ ret_string (enum GNUNET_ARM_Result result)
case GNUNET_ARM_RESULT_START_FAILED:
return _("service failed to start");
case GNUNET_ARM_RESULT_IN_SHUTDOWN:
- return _("service cannot be started because ARM is shutting down");
+ return _("service cannot be manipulated because ARM is shutting down");
}
return _("Unknown result code.");
}
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h
index 7fb14d3ac..f8d71bd8b 100644
--- a/src/include/gnunet_arm_service.h
+++ b/src/include/gnunet_arm_service.h
@@ -62,25 +62,9 @@ enum GNUNET_ARM_RequestStatus
GNUNET_ARM_REQUEST_SENT_OK = 0,
/**
- * Misconfiguration (can't connect to the ARM service).
- */
- GNUNET_ARM_REQUEST_CONFIGURATION_ERROR = 1,
-
- /**
* We disconnected from ARM, and request was not sent.
*/
- GNUNET_ARM_REQUEST_DISCONNECTED = 2,
-
- /**
- * ARM API is busy (probably trying to connect to ARM),
- * and request was not sent. Try again later.
- */
- GNUNET_ARM_REQUEST_BUSY = 3,
-
- /**
- * Request time ran out before we had a chance to send it.
- */
- GNUNET_ARM_REQUEST_TIMEOUT = 5
+ GNUNET_ARM_REQUEST_DISCONNECTED = 2
};
diff --git a/src/testbed/gnunet-service-testbed_peers.c
b/src/testbed/gnunet-service-testbed_peers.c
index a977b2b9b..aacd62583 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -1137,14 +1137,8 @@ arm_req_string (enum GNUNET_ARM_RequestStatus rs)
{
case GNUNET_ARM_REQUEST_SENT_OK:
return _("Message was sent successfully");
- case GNUNET_ARM_REQUEST_CONFIGURATION_ERROR:
- return _("Misconfiguration (can't connect to the ARM service)");
case GNUNET_ARM_REQUEST_DISCONNECTED:
return _("We disconnected from ARM before we could send a request");
- case GNUNET_ARM_REQUEST_BUSY:
- return _("ARM API is busy");
- case GNUNET_ARM_REQUEST_TIMEOUT:
- return _("Request timed out");
}
return _("Unknown request status");
}
--
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: remove dead enum values,
gnunet <=