More API cleanup, reversed changes that made context 'const'.

benchmark/blobslap_worker.c

@@ -13,7 +13,7 @@
 
 #include "benchmark.h"
 
-static void *worker_fn(gearman_job_st *job, const void *context,
+static void *worker_fn(gearman_job_st *job, void *context,
                        size_t *result_size, gearman_return_t *ret_ptr);
 
 static void usage(char *name);
@@ -130,7 +130,7 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-static void *worker_fn(gearman_job_st *job, const void *context,
+static void *worker_fn(gearman_job_st *job, void *context,
                        size_t *result_size, gearman_return_t *ret_ptr)
 {
   gearman_benchmark_st *benchmark= (gearman_benchmark_st *)context;

bin/gearman.c

@@ -92,7 +92,7 @@ static void _worker(gearman_args_st *args);
 /**
  * Callback function when worker gets a job.
  */
-static void *_worker_cb(gearman_job_st *job, const void *context,
+static void *_worker_cb(gearman_job_st *job, void *context,
                         size_t *result_size, gearman_return_t *ret_ptr);
 
 /**
@@ -460,7 +460,7 @@ void _worker(gearman_args_st *args)
   gearman_worker_free(&worker);
 }
 
-static void *_worker_cb(gearman_job_st *job, const void *context,
+static void *_worker_cb(gearman_job_st *job, void *context,
                         size_t *result_size, gearman_return_t *ret_ptr)
 {
   gearman_args_st *args= (gearman_args_st *)context;

examples/reverse_worker.c

@@ -27,7 +27,7 @@ typedef enum
   REVERSE_WORKER_OPTIONS_UNIQUE= (1 << 2)
 } reverse_worker_options_t;
 
-static void *reverse(gearman_job_st *job, const void *context,
+static void *reverse(gearman_job_st *job, void *context,
                      size_t *result_size, gearman_return_t *ret_ptr);
 
 static void usage(char *name);
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-static void *reverse(gearman_job_st *job, const void *context,
+static void *reverse(gearman_job_st *job, void *context,
                      size_t *result_size, gearman_return_t *ret_ptr)
 {
   reverse_worker_options_t options= *((reverse_worker_options_t *)context);

examples/wc_worker.c

@@ -19,7 +19,7 @@
 
 #include <libgearman/gearman.h>
 
-static void *wc(gearman_job_st *job, const void *context, size_t *result_size,
+static void *wc(gearman_job_st *job, void *context, size_t *result_size,
                 gearman_return_t *ret_ptr);
 
 static void usage(char *name);
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-static void *wc(gearman_job_st *job, const void *context, size_t *result_size,
+static void *wc(gearman_job_st *job, void *context, size_t *result_size,
                 gearman_return_t *ret_ptr)
 {
   const uint8_t *workload;

gearmand/gearmand.c

@@ -91,8 +91,7 @@ static void _pid_delete(const char *pid_file);
 static bool _switch_user(const char *user);
 static bool _set_signals(void);
 static void _shutdown_handler(int signal_arg);
-static void _log(const char *line, gearman_verbose_t verbose,
-                 const void *context);
+static void _log(const char *line, gearman_verbose_t verbose, void *context);
 
 int main(int argc, char *argv[])
 {
@@ -579,8 +578,7 @@ static void _shutdown_handler(int signal_arg)
     gearmand_wakeup(_gearmand, GEARMAND_WAKEUP_SHUTDOWN);
 }
 
-static void _log(const char *line, gearman_verbose_t verbose,
-                 const void *context)
+static void _log(const char *line, gearman_verbose_t verbose, void *context)
 {
   gearmand_log_info_st *log_info= (gearmand_log_info_st *)context;
   int fd;

libgearman-server/gearmand.c

@@ -24,8 +24,7 @@
  * @{
  */
 
-static void _log(const char *line, gearman_verbose_t verbose,
-                 const void *context);
+static void _log(const char *line, gearman_verbose_t verbose, void *context);
 
 static gearman_return_t _listen_init(gearmand_st *gearmand);
 static void _listen_close(gearmand_st *gearmand);
@@ -280,8 +279,7 @@ void gearmand_wakeup(gearmand_st *gearmand, gearmand_wakeup_t wakeup)
  * Private definitions
  */
 
-static void _log(const char *line, gearman_verbose_t verbose,
-                 const void *context)
+static void _log(const char *line, gearman_verbose_t verbose, void *context)
 {
   gearmand_st *gearmand= (gearmand_st *)context;
   (*gearmand->log_fn)(line, verbose, (void *)gearmand->log_context);

libgearman-server/gearmand_con.c

@@ -178,7 +178,7 @@ void gearmand_con_check_queue(gearmand_thread_st *thread)
 }
 
 gearman_return_t gearmand_con_watch(gearman_con_st *con, short events,
-                                    const void *context __attribute__ ((unused)))
+                                    void *context __attribute__ ((unused)))
 {
   (void) context;
   gearmand_con_st *dcon;

libgearman-server/gearmand_con.h

@@ -61,7 +61,7 @@ void gearmand_con_check_queue(gearmand_thread_st *thread);
  */
 GEARMAN_API
 gearman_return_t gearmand_con_watch(gearman_con_st *con, short events,
-                                    const void *context);
+                                    void *context);
 
 /** @} */
 

libgearman-server/gearmand_thread.c

@@ -25,8 +25,7 @@
  */
 
 static void *_thread(void *data);
-static void _log(const char *line, gearman_verbose_t verbose,
-                 const void *context);
+static void _log(const char *line, gearman_verbose_t verbose, void *context);
 static void _run(gearman_server_thread_st *thread, void *fn_arg);
 
 static gearman_return_t _wakeup_init(gearmand_thread_st *thread);
@@ -256,8 +255,7 @@ static void *_thread(void *data)
   return NULL;
 }
 
-static void _log(const char *line, gearman_verbose_t verbose,
-                 const void *context)
+static void _log(const char *line, gearman_verbose_t verbose, void *context)
 {
   gearmand_thread_st *dthread= (gearmand_thread_st *)context;
   char buffer[GEARMAN_MAX_ERROR_SIZE];

libgearman-server/protocol_http.c

@@ -38,7 +38,7 @@ typedef struct
 
 /* Protocol callback functions. */
 static gearman_return_t _http_con_add(gearman_con_st *con);
-static void _http_free(gearman_con_st *con, const void *context);
+static void _http_free(gearman_con_st *con, void *context);
 static size_t _http_pack(const gearman_packet_st *packet, gearman_con_st *con,
                          void *data, size_t data_size,
                          gearman_return_t *ret_ptr);
@@ -137,7 +137,7 @@ static gearman_return_t _http_con_add(gearman_con_st *con)
 }
 
 static void _http_free(gearman_con_st *con __attribute__ ((unused)),
-                       const void *context)
+                       void *context)
 {
   free((gearman_protocol_http_st *)context);
 }