diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-04-14 20:45:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-04-14 20:45:25 +0000 |
commit | 08676aaa5b76a0723c8c60ee510aec3652e50774 (patch) | |
tree | 0c1ccb9bd806733aba38f76c79499cb0f3cec048 /src/arm/gnunet-arm.c | |
parent | ce52e258a28a17f5c319549fda1b5fbb8f6169a7 (diff) | |
download | gnunet-08676aaa5b76a0723c8c60ee510aec3652e50774.tar.gz gnunet-08676aaa5b76a0723c8c60ee510aec3652e50774.zip |
-remove unnecessary arguments from ARM callbacks
Diffstat (limited to 'src/arm/gnunet-arm.c')
-rw-r--r-- | src/arm/gnunet-arm.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index cfadbc87a..87d352dfb 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c | |||
@@ -258,12 +258,11 @@ static void action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *t | |||
258 | * Function called whenever we connect to or disconnect from ARM. | 258 | * Function called whenever we connect to or disconnect from ARM. |
259 | * | 259 | * |
260 | * @param cls closure | 260 | * @param cls closure |
261 | * @param arm handle to the ARM connection | ||
262 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, | 261 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, |
263 | * GNUNET_SYSERR on error. | 262 | * GNUNET_SYSERR on error. |
264 | */ | 263 | */ |
265 | static void | 264 | static void |
266 | conn_status (void *cls, struct GNUNET_ARM_Handle *arm, | 265 | conn_status (void *cls, |
267 | int connected) | 266 | int connected) |
268 | { | 267 | { |
269 | if (GNUNET_SYSERR == connected) | 268 | if (GNUNET_SYSERR == connected) |
@@ -281,7 +280,7 @@ conn_status (void *cls, struct GNUNET_ARM_Handle *arm, | |||
281 | 280 | ||
282 | 281 | ||
283 | static void | 282 | static void |
284 | term_callback (void *cls, struct GNUNET_ARM_Handle *arm, | 283 | term_callback (void *cls, |
285 | enum GNUNET_ARM_RequestStatus rs, const char *service, | 284 | enum GNUNET_ARM_RequestStatus rs, const char *service, |
286 | enum GNUNET_ARM_Result result) | 285 | enum GNUNET_ARM_Result result) |
287 | { | 286 | { |
@@ -311,7 +310,7 @@ term_callback (void *cls, struct GNUNET_ARM_Handle *arm, | |||
311 | } | 310 | } |
312 | 311 | ||
313 | static void | 312 | static void |
314 | end_callback (void *cls, struct GNUNET_ARM_Handle *arm, | 313 | end_callback (void *cls, |
315 | enum GNUNET_ARM_RequestStatus rs, const char *service, | 314 | enum GNUNET_ARM_RequestStatus rs, const char *service, |
316 | enum GNUNET_ARM_Result result) | 315 | enum GNUNET_ARM_Result result) |
317 | { | 316 | { |
@@ -348,7 +347,7 @@ end_callback (void *cls, struct GNUNET_ARM_Handle *arm, | |||
348 | } | 347 | } |
349 | 348 | ||
350 | static void | 349 | static void |
351 | start_callback (void *cls, struct GNUNET_ARM_Handle *arm, | 350 | start_callback (void *cls, |
352 | enum GNUNET_ARM_RequestStatus rs, const char *service, | 351 | enum GNUNET_ARM_RequestStatus rs, const char *service, |
353 | enum GNUNET_ARM_Result result) | 352 | enum GNUNET_ARM_Result result) |
354 | { | 353 | { |
@@ -378,7 +377,7 @@ start_callback (void *cls, struct GNUNET_ARM_Handle *arm, | |||
378 | 377 | ||
379 | 378 | ||
380 | static void | 379 | static void |
381 | init_callback (void *cls, struct GNUNET_ARM_Handle *arm, | 380 | init_callback (void *cls, |
382 | enum GNUNET_ARM_RequestStatus rs, const char *service, | 381 | enum GNUNET_ARM_RequestStatus rs, const char *service, |
383 | enum GNUNET_ARM_Result result) | 382 | enum GNUNET_ARM_Result result) |
384 | { | 383 | { |
@@ -409,9 +408,9 @@ init_callback (void *cls, struct GNUNET_ARM_Handle *arm, | |||
409 | 408 | ||
410 | 409 | ||
411 | static void | 410 | static void |
412 | list_callback (void *cls, struct GNUNET_ARM_Handle *arm, | 411 | list_callback (void *cls, |
413 | enum GNUNET_ARM_RequestStatus rs, unsigned int count, | 412 | enum GNUNET_ARM_RequestStatus rs, unsigned int count, |
414 | const char *const*list) | 413 | const char *const*list) |
415 | { | 414 | { |
416 | unsigned int i; | 415 | unsigned int i; |
417 | if (GNUNET_ARM_REQUEST_SENT_OK != rs) | 416 | if (GNUNET_ARM_REQUEST_SENT_OK != rs) |
@@ -517,13 +516,12 @@ action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
517 | * Function called when a service starts or stops. | 516 | * Function called when a service starts or stops. |
518 | * | 517 | * |
519 | * @param cls closure | 518 | * @param cls closure |
520 | * @param arm handle to the ARM connection | ||
521 | * @param service service name | 519 | * @param service service name |
522 | * @param status status of the service | 520 | * @param status status of the service |
523 | */ | 521 | */ |
524 | static void | 522 | static void |
525 | srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *arm, | 523 | srv_status (void *cls, |
526 | const char *service, enum GNUNET_ARM_ServiceStatus status) | 524 | const char *service, enum GNUNET_ARM_ServiceStatus status) |
527 | { | 525 | { |
528 | const char *msg; | 526 | const char *msg; |
529 | switch (status) | 527 | switch (status) |