additional places:

3818.   [bug]           Stop lying to the optimizer that 'void *arg' is a
                        constant in isc_event_allocate.

(cherry picked from commit 39b52695771532e3df0c83a9b6683f899afa403a)

diff --git a/lib/isc/include/isc/timer.h b/lib/isc/include/isc/timer.h
index f3c74a77cc35ee84c3a28fbc91de67e8f732df82..361e3d12359b4bad113ac4c054518efa5b56b8eb 100644 (file)
--- a/lib/isc/include/isc/timer.h
+++ b/lib/isc/include/isc/timer.h
@@ -113,7 +113,7 @@ typedef struct {
                                       const isc_interval_t *interval,
                                       isc_task_t *task,
                                       isc_taskaction_t action,
-                                      const void *arg,
+                                      void *arg,
                                       isc_timer_t **timerp);
 } isc_timermgrmethods_t;
 
@@ -174,7 +174,7 @@ isc_timer_create(isc_timermgr_t *manager,
                 const isc_interval_t *interval,
                 isc_task_t *task,
                 isc_taskaction_t action,
-                const void *arg,
+                void *arg,
                 isc_timer_t **timerp);
 /*%<
  * Create a new 'type' timer managed by 'manager'.  The timers parameters

diff --git a/lib/isc/timer.c b/lib/isc/timer.c
index c28851565b49ec41c4c3211aa9bdf26f703b98e6..18eb9e06cd119f04b2d2fc8b082c5a403f415f64 100644 (file)
--- a/lib/isc/timer.c
+++ b/lib/isc/timer.c
@@ -126,7 +126,7 @@ struct isc__timermgr {
 isc_result_t
 isc__timer_create(isc_timermgr_t *manager, isc_timertype_t type,
                  const isc_time_t *expires, const isc_interval_t *interval,
-                 isc_task_t *task, isc_taskaction_t action, const void *arg,
+                 isc_task_t *task, isc_taskaction_t action, void *arg,
                  isc_timer_t **timerp);
 isc_result_t
 isc__timer_reset(isc_timer_t *timer, isc_timertype_t type,
@@ -378,7 +378,7 @@ destroy(isc__timer_t *timer) {
 isc_result_t
 isc__timer_create(isc_timermgr_t *manager0, isc_timertype_t type,
                  const isc_time_t *expires, const isc_interval_t *interval,
-                 isc_task_t *task, isc_taskaction_t action, const void *arg,
+                 isc_task_t *task, isc_taskaction_t action, void *arg,
                  isc_timer_t **timerp)
 {
        isc__timermgr_t *manager = (isc__timermgr_t *)manager0;