Browse Source

Remove the client store in the function.

Brian Aker 14 years ago
parent
commit
44101d587f

+ 1 - 1
examples/reverse_client_bg.cc

@@ -123,7 +123,7 @@ int main(int args, char *argv[])
   if (timeout >= 0)
     gearman_client_set_timeout(&client, timeout);
 
-  gearman_function_t *function= gearman_function_create(&client, gearman_literal_param("reverse"));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param("reverse"));
 
   gearman_workload_t workload= gearman_workload_make(text_to_echo.c_str(), text_to_echo.size());
   gearman_workload_set_background(&workload, true);

+ 1 - 1
examples/reverse_client_epoch.cc

@@ -124,7 +124,7 @@ int main(int args, char *argv[])
   if (timeout >= 0)
     gearman_client_set_timeout(&client, timeout);
 
-  gearman_function_t *function= gearman_function_create(&client, gearman_literal_param("reverse"));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param("reverse"));
 
   gearman_unique_t unique= gearman_unique_make(gearman_literal_param("epoch"));
   gearman_workload_t workload= gearman_workload_make(text_to_echo.c_str(), text_to_echo.size());

+ 2 - 2
libgearman/function.cc

@@ -44,10 +44,10 @@ struct gearman_function_t {
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 
-gearman_function_t *gearman_function_create(struct gearman_client_st *client, const char *name, size_t size)
+gearman_function_t *gearman_function_create(const char *name, size_t size)
 {
   errno= 0;
-  if (not client or not name or not size)
+  if (not name or not size)
   {
     errno= EINVAL;
     return NULL;

+ 1 - 1
libgearman/function.h

@@ -42,7 +42,7 @@ extern "C" {
 #endif
 
 GEARMAN_API
-gearman_function_t *gearman_function_create(struct gearman_client_st *, const char *, size_t size);
+gearman_function_t *gearman_function_create(const char *, size_t size);
 
 GEARMAN_API
 void gearman_function_free(gearman_function_t *);

+ 6 - 7
tests/client_test.cc

@@ -690,10 +690,9 @@ static test_return_t strerror_strings(void *object  __attribute__((unused)))
   return TEST_SUCCESS;
 }
 
-static test_return_t allocate_function(void *object)
+static test_return_t allocate_function(void *)
 {
-  gearman_client_st *client= (gearman_client_st *)object;
-  gearman_function_t *function= gearman_function_create(client, gearman_literal_param("test"));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param("test"));
   gearman_function_free(function);
 
   return TEST_SUCCESS;
@@ -702,7 +701,7 @@ static test_return_t allocate_function(void *object)
 static test_return_t gearman_client_execute_test(void *object)
 {
   gearman_client_st *client= (gearman_client_st *)object;
-  gearman_function_t *function= gearman_function_create(client, gearman_literal_param(WORKER_FUNCTION_NAME));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param(WORKER_FUNCTION_NAME));
 
   gearman_workload_t workload= gearman_workload_make(gearman_literal_param("test load"));
 
@@ -725,7 +724,7 @@ static test_return_t gearman_client_execute_timeout_test(void *object)
   gearman_client_st *original= (gearman_client_st *)object;
   gearman_client_st *client= gearman_client_clone(NULL, original);
   test_truth(client);
-  gearman_function_t *function= gearman_function_create(client, gearman_literal_param("no_worker_should_be_found"));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param("no_worker_should_be_found"));
   gearman_workload_t workload= gearman_workload_make(gearman_literal_param("test load"));
 
   int timeout= gearman_client_timeout(client);
@@ -746,7 +745,7 @@ static test_return_t gearman_client_execute_timeout_test(void *object)
 static test_return_t gearman_client_execute_epoch_test(void *object)
 {
   gearman_client_st *client= (gearman_client_st *)object;
-  gearman_function_t *function= gearman_function_create(client, gearman_literal_param(WORKER_FUNCTION_NAME));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param(WORKER_FUNCTION_NAME));
 
   gearman_workload_t workload= gearman_workload_make(gearman_literal_param("test load"));
   gearman_workload_set_epoch(&workload, time(NULL) +5);
@@ -767,7 +766,7 @@ static test_return_t gearman_client_execute_epoch_test(void *object)
 static test_return_t gearman_client_execute_bg_test(void *object)
 {
   gearman_client_st *client= (gearman_client_st *)object;
-  gearman_function_t *function= gearman_function_create(client, gearman_literal_param(WORKER_FUNCTION_NAME));
+  gearman_function_t *function= gearman_function_create(gearman_literal_param(WORKER_FUNCTION_NAME));
 
   gearman_workload_t workload= gearman_workload_make(gearman_literal_param("test load"));
   gearman_workload_set_background(&workload, true);