[GNUnet-SVN] r36181 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2015-08-03 11:44:26 +0200 (Mon, 03 Aug 2015)
New Revision: 36181

Modified:
   gnunet/src/include/gnunet_scheduler_lib.h
   gnunet/src/util/scheduler.c
Log:
eliminate dead GNUNET_SCHEDULER_add_continuation, rename 
GNUNET_SCHEDULER_add_continuation_with_priority to 
GNUNET_SCHEDULER_add_with_reason_and_priority for consistency

Modified: gnunet/src/include/gnunet_scheduler_lib.h
===================================================================
--- gnunet/src/include/gnunet_scheduler_lib.h   2015-08-03 09:43:20 UTC (rev 
36180)
+++ gnunet/src/include/gnunet_scheduler_lib.h   2015-08-03 09:44:26 UTC (rev 
36181)
@@ -221,30 +221,15 @@
  * and the reason code can be specified.
  *
  * @param task main function of the task
- * @param task_cls closure of task
- * @param reason reason for task invocation
- */
-void
-GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_TaskCallback task,
-                                   void *task_cls,
-                                   enum GNUNET_SCHEDULER_Reason reason);
-
-
-/**
- * Continue the current execution with the given function.  This is
- * similar to the other "add" functions except that there is no delay
- * and the reason code can be specified.
- *
- * @param task main function of the task
  * @param task_cls closure for @a task
  * @param reason reason for task invocation
  * @param priority priority to use for the task
  */
 void
-GNUNET_SCHEDULER_add_continuation_with_priority (GNUNET_SCHEDULER_TaskCallback 
task,
-                                                 void *task_cls,
-                                                enum GNUNET_SCHEDULER_Reason 
reason,
-                                                enum GNUNET_SCHEDULER_Priority 
priority);
+GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback 
task,
+                                               void *task_cls,
+                                               enum GNUNET_SCHEDULER_Reason 
reason,
+                                               enum GNUNET_SCHEDULER_Priority 
priority);
 
 
 /**

Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2015-08-03 09:43:20 UTC (rev 36180)
+++ gnunet/src/util/scheduler.c 2015-08-03 09:44:26 UTC (rev 36181)
@@ -757,9 +757,10 @@
 #endif
   current_priority = GNUNET_SCHEDULER_PRIORITY_DEFAULT;
   current_lifeness = GNUNET_YES;
-  GNUNET_SCHEDULER_add_continuation (task,
-                                     task_cls,
-                                     GNUNET_SCHEDULER_REASON_STARTUP);
+  GNUNET_SCHEDULER_add_with_reason_and_priority (task,
+                                                 task_cls,
+                                                 
GNUNET_SCHEDULER_REASON_STARTUP,
+                                                 
GNUNET_SCHEDULER_PRIORITY_DEFAULT);
   active_task = (void *) (long) -1;     /* force passing of sanity check */
   GNUNET_SCHEDULER_add_now_with_lifeness (GNUNET_NO,
                                           
&GNUNET_OS_install_parent_control_handler,
@@ -1004,10 +1005,10 @@
  * @param priority priority to use for the task
  */
 void
-GNUNET_SCHEDULER_add_continuation_with_priority (GNUNET_SCHEDULER_TaskCallback 
task,
-                                                 void *task_cls,
-                                                enum GNUNET_SCHEDULER_Reason 
reason,
-                                                enum GNUNET_SCHEDULER_Priority 
priority)
+GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback 
task,
+                                               void *task_cls,
+                                               enum GNUNET_SCHEDULER_Reason 
reason,
+                                               enum GNUNET_SCHEDULER_Priority 
priority)
 {
   struct GNUNET_SCHEDULER_Task *t;
 
@@ -1042,25 +1043,6 @@
 
 
 /**
- * Continue the current execution with the given function.  This is
- * similar to the other "add" functions except that there is no delay
- * and the reason code can be specified.
- *
- * @param task main function of the task
- * @param task_cls closure for @a task
- * @param reason reason for task invocation
- */
-void
-GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_TaskCallback task, void 
*task_cls,
-                                   enum GNUNET_SCHEDULER_Reason reason)
-{
-  GNUNET_SCHEDULER_add_continuation_with_priority (task, task_cls,
-                                                  reason,
-                                                  
GNUNET_SCHEDULER_PRIORITY_DEFAULT);
-}
-
-
-/**
  * Schedule a new task to be run with a specified delay.  The task
  * will be scheduled for execution once the delay has expired.
  *