diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-08 18:54:17 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-08 18:54:17 +0100 |
commit | 95646a7b495153841c53034abca516c9261b2fb7 (patch) | |
tree | 51c379f187456ac2e5fb23a9c6098b89e384ca74 /src | |
parent | baffe75109684b28fbf814582984cc780ca93951 (diff) | |
download | gnunet-95646a7b495153841c53034abca516c9261b2fb7.tar.gz gnunet-95646a7b495153841c53034abca516c9261b2fb7.zip |
remove dead enum values
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/gnunet-arm.c | 8 | ||||
-rw-r--r-- | src/include/gnunet_arm_service.h | 18 | ||||
-rw-r--r-- | 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) | |||
220 | { | 220 | { |
221 | case GNUNET_ARM_REQUEST_SENT_OK: | 221 | case GNUNET_ARM_REQUEST_SENT_OK: |
222 | return _("Message was sent successfully"); | 222 | return _("Message was sent successfully"); |
223 | case GNUNET_ARM_REQUEST_CONFIGURATION_ERROR: | ||
224 | return _("Misconfiguration (can not connect to the ARM service)"); | ||
225 | case GNUNET_ARM_REQUEST_DISCONNECTED: | 223 | case GNUNET_ARM_REQUEST_DISCONNECTED: |
226 | return _("We disconnected from ARM before we could send a request"); | 224 | return _("We disconnected from ARM before we could send a request"); |
227 | case GNUNET_ARM_REQUEST_BUSY: | ||
228 | return _("ARM API is busy"); | ||
229 | case GNUNET_ARM_REQUEST_TIMEOUT: | ||
230 | return _("Request timed out"); | ||
231 | } | 225 | } |
232 | return _("Unknown request status"); | 226 | return _("Unknown request status"); |
233 | } | 227 | } |
@@ -263,7 +257,7 @@ ret_string (enum GNUNET_ARM_Result result) | |||
263 | case GNUNET_ARM_RESULT_START_FAILED: | 257 | case GNUNET_ARM_RESULT_START_FAILED: |
264 | return _("service failed to start"); | 258 | return _("service failed to start"); |
265 | case GNUNET_ARM_RESULT_IN_SHUTDOWN: | 259 | case GNUNET_ARM_RESULT_IN_SHUTDOWN: |
266 | return _("service cannot be started because ARM is shutting down"); | 260 | return _("service cannot be manipulated because ARM is shutting down"); |
267 | } | 261 | } |
268 | return _("Unknown result code."); | 262 | return _("Unknown result code."); |
269 | } | 263 | } |
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 | |||
62 | GNUNET_ARM_REQUEST_SENT_OK = 0, | 62 | GNUNET_ARM_REQUEST_SENT_OK = 0, |
63 | 63 | ||
64 | /** | 64 | /** |
65 | * Misconfiguration (can't connect to the ARM service). | ||
66 | */ | ||
67 | GNUNET_ARM_REQUEST_CONFIGURATION_ERROR = 1, | ||
68 | |||
69 | /** | ||
70 | * We disconnected from ARM, and request was not sent. | 65 | * We disconnected from ARM, and request was not sent. |
71 | */ | 66 | */ |
72 | GNUNET_ARM_REQUEST_DISCONNECTED = 2, | 67 | GNUNET_ARM_REQUEST_DISCONNECTED = 2 |
73 | |||
74 | /** | ||
75 | * ARM API is busy (probably trying to connect to ARM), | ||
76 | * and request was not sent. Try again later. | ||
77 | */ | ||
78 | GNUNET_ARM_REQUEST_BUSY = 3, | ||
79 | |||
80 | /** | ||
81 | * Request time ran out before we had a chance to send it. | ||
82 | */ | ||
83 | GNUNET_ARM_REQUEST_TIMEOUT = 5 | ||
84 | 68 | ||
85 | }; | 69 | }; |
86 | 70 | ||
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) | |||
1137 | { | 1137 | { |
1138 | case GNUNET_ARM_REQUEST_SENT_OK: | 1138 | case GNUNET_ARM_REQUEST_SENT_OK: |
1139 | return _("Message was sent successfully"); | 1139 | return _("Message was sent successfully"); |
1140 | case GNUNET_ARM_REQUEST_CONFIGURATION_ERROR: | ||
1141 | return _("Misconfiguration (can't connect to the ARM service)"); | ||
1142 | case GNUNET_ARM_REQUEST_DISCONNECTED: | 1140 | case GNUNET_ARM_REQUEST_DISCONNECTED: |
1143 | return _("We disconnected from ARM before we could send a request"); | 1141 | return _("We disconnected from ARM before we could send a request"); |
1144 | case GNUNET_ARM_REQUEST_BUSY: | ||
1145 | return _("ARM API is busy"); | ||
1146 | case GNUNET_ARM_REQUEST_TIMEOUT: | ||
1147 | return _("Request timed out"); | ||
1148 | } | 1142 | } |
1149 | return _("Unknown request status"); | 1143 | return _("Unknown request status"); |
1150 | } | 1144 | } |