Merge additional updates for style.

libgearman/add.cc

@@ -40,6 +40,7 @@
 
 #include <libgearman/add.h>
 #include <libgearman/connection.h>
+#include <libgearman/packet.hpp>
 
 #include <cassert>
 #include <cerrno>
@@ -129,7 +130,7 @@ gearman_task_st *add_task(gearman_client_st *client,
     args[3]= gearman_c_str(workload);
     args_size[3]= gearman_size(workload);
 
-    rc= gearman_packet_create_args(&client->universal, &(task->send),
+    rc= gearman_packet_create_args(client->universal, &(task->send),
                                    GEARMAN_MAGIC_REQUEST, command,
                                    args, args_size,
                                    4);
@@ -139,7 +140,7 @@ gearman_task_st *add_task(gearman_client_st *client,
     args[2]= gearman_c_str(workload);
     args_size[2]= gearman_size(workload);
 
-    rc= gearman_packet_create_args(&client->universal, &(task->send),
+    rc= gearman_packet_create_args(client->universal, &(task->send),
                                    GEARMAN_MAGIC_REQUEST, command,
                                    args, args_size,
                                    3);
@@ -248,7 +249,7 @@ gearman_task_st *add_task(gearman_client_st *client,
   args_size[4]= gearman_size(workload);
 
   gearman_return_t rc;
-  rc= gearman_packet_create_args(&client->universal, &(task->send),
+  rc= gearman_packet_create_args(client->universal, &(task->send),
                                  GEARMAN_MAGIC_REQUEST, command,
                                  args, args_size,
                                  5);

libgearman/client.cc

@@ -46,6 +46,7 @@
 
 #include <libgearman/add.h>
 #include <libgearman/connection.h>
+#include <libgearman/packet.hpp>
 
 #include <cassert>
 #include <cerrno>
@@ -969,11 +970,10 @@ gearman_task_st *gearman_client_add_task_status(gearman_client_st *client,
 
   args[0]= job_handle;
   args_size[0]= strlen(job_handle);
-  gearman_return_t rc;
-  rc= gearman_packet_create_args(&client->universal, &(task->send),
-                                 GEARMAN_MAGIC_REQUEST,
-                                 GEARMAN_COMMAND_GET_STATUS,
-                                 args, args_size, 1);
+  gearman_return_t rc= gearman_packet_create_args(client->universal, &(task->send),
+                                                  GEARMAN_MAGIC_REQUEST,
+                                                  GEARMAN_COMMAND_GET_STATUS,
+                                                  args, args_size, 1);
   if (gearman_success(rc))
   {
     client->new_tasks++;

libgearman/job.cc

@@ -46,6 +46,7 @@
 #include <libgearman/universal.hpp>
 #include <libgearman/aggregator.hpp>
 #include <libgearman/connection.h>
+#include <libgearman/packet.hpp>
 #include <libgearman/packet.h>
 #include <libgearman/add.h>
 #include <cassert>
@@ -236,7 +237,7 @@ gearman_return_t gearman_job_send_data(gearman_job_st *job, const void *data, si
     args_size[0]= job->assigned.arg_size[0];
     args[1]= data;
     args_size[1]= data_size;
-    ret= gearman_packet_create_args(&(job->worker->universal), &(job->work),
+    ret= gearman_packet_create_args(job->worker->universal, &(job->work),
                                     GEARMAN_MAGIC_REQUEST,
                                     GEARMAN_COMMAND_WORK_DATA,
                                     args, args_size, 2);
@@ -263,7 +264,7 @@ gearman_return_t gearman_job_send_warning(gearman_job_st *job,
     args_size[0]= job->assigned.arg_size[0];
     args[1]= warning;
     args_size[1]= warning_size;
-    ret= gearman_packet_create_args(&(job->worker->universal), &(job->work),
+    ret= gearman_packet_create_args(job->worker->universal, &(job->work),
                                     GEARMAN_MAGIC_REQUEST,
                                     GEARMAN_COMMAND_WORK_WARNING,
                                     args, args_size, 2);
@@ -297,7 +298,7 @@ gearman_return_t gearman_job_send_status(gearman_job_st *job,
     args_size[1]= strlen(numerator_string) + 1;
     args[2]= denominator_string;
     args_size[2]= strlen(denominator_string);
-    ret= gearman_packet_create_args(&(job->worker->universal), &(job->work),
+    ret= gearman_packet_create_args(job->worker->universal, &(job->work),
                                     GEARMAN_MAGIC_REQUEST,
                                     GEARMAN_COMMAND_WORK_STATUS,
                                     args, args_size, 3);
@@ -358,7 +359,7 @@ gearman_return_t gearman_job_send_complete(gearman_job_st *job,
 
     args[1]= result;
     args_size[1]= result_size;
-    gearman_return_t ret= gearman_packet_create_args(&(job->worker->universal), &(job->work),
+    gearman_return_t ret= gearman_packet_create_args(job->worker->universal, &(job->work),
                                                      GEARMAN_MAGIC_REQUEST,
                                                      GEARMAN_COMMAND_WORK_COMPLETE,
                                                      args, args_size, 2);
@@ -394,11 +395,10 @@ gearman_return_t gearman_job_send_exception(gearman_job_st *job,
     args[1]= exception;
     args_size[1]= exception_size;
 
-    gearman_return_t ret;
-    ret= gearman_packet_create_args(&(job->worker->universal), &(job->work),
-                                    GEARMAN_MAGIC_REQUEST,
-                                    GEARMAN_COMMAND_WORK_EXCEPTION,
-                                    args, args_size, 2);
+    gearman_return_t ret= gearman_packet_create_args(job->worker->universal, &(job->work),
+                                                     GEARMAN_MAGIC_REQUEST,
+                                                     GEARMAN_COMMAND_WORK_EXCEPTION,
+                                                     args, args_size, 2);
     if (gearman_failed(ret))
       return ret;
 
@@ -420,11 +420,10 @@ gearman_return_t gearman_job_send_fail(gearman_job_st *job)
   {
     args[0]= job->assigned.arg[0];
     args_size[0]= job->assigned.arg_size[0] - 1;
-    gearman_return_t ret;
-    ret= gearman_packet_create_args(&(job->worker->universal), &(job->work),
-                                    GEARMAN_MAGIC_REQUEST,
-                                    GEARMAN_COMMAND_WORK_FAIL,
-                                    args, args_size, 1);
+    gearman_return_t ret= gearman_packet_create_args(job->worker->universal, &(job->work),
+                                                     GEARMAN_MAGIC_REQUEST,
+                                                     GEARMAN_COMMAND_WORK_FAIL,
+                                                     args, args_size, 1);
     if (gearman_failed(ret))
       return ret;
 

libgearman/packet.cc

@@ -192,7 +192,7 @@ gearman_return_t gearman_packet_create_arg(gearman_packet_st *packet,
   return packet_create_arg(packet, arg, arg_size);
 }
 
-gearman_return_t gearman_packet_create_args(gearman_universal_st *gearman,
+gearman_return_t gearman_packet_create_args(gearman_universal_st& universal,
                                             gearman_packet_st *packet,
                                             enum gearman_magic_t magic,
                                             gearman_command_t command,
@@ -200,7 +200,7 @@ gearman_return_t gearman_packet_create_args(gearman_universal_st *gearman,
                                             const size_t args_size[],
                                             size_t args_count)
 {
-  packet= gearman_packet_create(*gearman, packet);
+  packet= gearman_packet_create(universal, packet);
   if (not packet)
   {
     return GEARMAN_MEMORY_ALLOCATION_FAILURE;

libgearman/packet.h

@@ -107,54 +107,6 @@ typedef size_t (gearman_packet_unpack_fn)(gearman_packet_st *packet,
 extern GEARMAN_INTERNAL_API
 gearman_command_info_st gearman_command_info_list[GEARMAN_COMMAND_MAX];
 
-/**
- * Free a packet structure.
- *
- * @param[in] packet Structure previously initialized with
- *   gearman_packet_create() or gearman_packet_create_args().
- */
-GEARMAN_INTERNAL_API
-void gearman_packet_free(gearman_packet_st *packet);
-
-/**
- * Initialize a packet with all arguments. For example:
- *
- * @code
- * void *args[3];
- * size_t args_suze[3];
- *
- * args[0]= function_name;
- * args_size[0]= strlen(function_name) + 1;
- * args[1]= unique_string;
- * args_size[1]= strlen(unique_string,) + 1;
- * args[2]= workload;
- * args_size[2]= workload_size;
- *
- * ret= gearman_packet_create_args(gearman, packet,
- *                              GEARMAN_MAGIC_REQUEST,
- *                              GEARMAN_COMMAND_SUBMIT_JOB,
- *                              args, args_size, 3);
- * @endcode
- *
- * @param[in] gearman Structure previously initialized with gearman_create() or
- *  gearman_clone().
- * @param[in] packet Pre-allocated packet to initialize with arguments.
- * @param[in] magic Magic type for packet header.
- * @param[in] command Command type for packet.
- * @param[in] args Array of arguments to add.
- * @param[in] args_size Array of sizes of each byte array in the args array.
- * @param[in] args_count Number of elements in args/args_sizes arrays.
- * @return Standard gearman return value.
- */
-GEARMAN_INTERNAL_API
-gearman_return_t gearman_packet_create_args(gearman_universal_st *gearman,
-                                            gearman_packet_st *packet,
-                                            enum gearman_magic_t magic,
-                                            gearman_command_t command,
-                                            const void *args[],
-                                            const size_t args_size[],
-                                            size_t args_count);
-
 /**
  * Add an argument to a packet.
  */

libgearman/packet.hpp

@@ -38,5 +38,38 @@
 
 #pragma once
 
+#include <libgearman/packet.h>
+
+GEARMAN_LOCAL
+gearman_packet_st *gearman_packet_create(gearman_universal_st&, gearman_packet_st *packet);
+
+GEARMAN_LOCAL
+void gearman_packet_free(gearman_packet_st*);
+
+/**
+ * Initialize a packet with all arguments. For example:
+ *
+ * void *args[3];
+ * size_t args_suze[3];
+ *
+ * args[0]= function_name;
+ * args_size[0]= strlen(function_name) + 1;
+ * args[1]= unique_string;
+ * args_size[1]= strlen(unique_string,) + 1;
+ * args[2]= workload;
+ * args_size[2]= workload_size;
+ *
+ * ret= gearman_packet_create_args(gearman, packet,
+ *                              GEARMAN_MAGIC_REQUEST,
+ *                              GEARMAN_COMMAND_SUBMIT_JOB,
+ *                              args, args_size, 3);
+ */
+
 GEARMAN_LOCAL
-gearman_packet_st *gearman_packet_create(gearman_universal_st &, gearman_packet_st *packet);
+gearman_return_t gearman_packet_create_args(gearman_universal_st&,
+                                            gearman_packet_st *packet,
+                                            enum gearman_magic_t magic,
+                                            gearman_command_t command,
+                                            const void *args[],
+                                            const size_t args_size[],
+                                            size_t args_count);

libgearman/task.cc

@@ -44,7 +44,7 @@
 #include <libgearman/common.h>
 #include <libgearman/universal.hpp>
 #include <libgearman/connection.h>
-#include <libgearman/packet.h>
+#include <libgearman/packet.hpp>
 
 #include <cerrno>
 #include <cassert>

libgearman/universal.cc

@@ -13,6 +13,7 @@
 
 #include <libgearman/common.h>
 #include <libgearman/connection.h>
+#include <libgearman/packet.hpp>
 #include <libgearman/universal.hpp>
 
 #include <cassert>
@@ -288,7 +289,7 @@ gearman_return_t gearman_echo(gearman_universal_st *universal,
   gearman_return_t ret;
   bool orig_block_universal;
 
-  ret= gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
+  ret= gearman_packet_create_args(*universal, &packet, GEARMAN_MAGIC_REQUEST,
                                   GEARMAN_COMMAND_ECHO_REQ,
                                   &workload, &workload_size, 1);
   if (gearman_failed(ret))
@@ -349,7 +350,7 @@ bool gearman_request_option(gearman_universal_st &universal,
   const void *args[]= { gearman_c_str(option) };
   size_t args_size[]= { gearman_size(option) };
 
-  ret= gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
+  ret= gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
                                   GEARMAN_COMMAND_OPTION_REQ,
                                   args, args_size, 1);
   if (gearman_failed(ret))

libgearman/worker.cc

@@ -13,6 +13,7 @@
 
 #include <libgearman/common.h>
 #include <libgearman/connection.h>
+#include <libgearman/packet.hpp>
 #include <libgearman/universal.hpp>
 
 #include <cassert>
@@ -201,8 +202,8 @@ void gearman_worker_free(gearman_worker_st *worker)
 
   if (worker->options.packet_init)
   {
-    gearman_packet_free(&(worker->grab_job));
-    gearman_packet_free(&(worker->pre_sleep));
+    gearman_packet_free(&worker->grab_job);
+    gearman_packet_free(&worker->pre_sleep);
   }
 
   gearman_job_free(worker->job);
@@ -468,10 +469,10 @@ static inline gearman_return_t _worker_unregister(gearman_worker_st *worker,
 
   args[0]= function->name();
   args_size[0]= function->length();
-  ret= gearman_packet_create_args((&worker->universal), &(function->packet),
+  ret= gearman_packet_create_args(worker->universal, &(function->packet),
                                   GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_CANT_DO,
                                   args, args_size, 1);
-  if (ret != GEARMAN_SUCCESS)
+  if (gearman_failed(ret))
   {
     function->options.packet_in_use= false;
     return ret;
@@ -493,7 +494,6 @@ gearman_return_t gearman_worker_unregister(gearman_worker_st *worker,
 
 gearman_return_t gearman_worker_unregister_all(gearman_worker_st *worker)
 {
-  gearman_return_t ret;
   struct _worker_function_st *function;
   uint32_t count= 0;
 
@@ -514,12 +514,12 @@ gearman_return_t gearman_worker_unregister_all(gearman_worker_st *worker)
 
   gearman_packet_free(&(worker->function_list->packet));
 
-  ret= gearman_packet_create_args((&worker->universal),
-                                  &(worker->function_list->packet),
-                                  GEARMAN_MAGIC_REQUEST,
-                                  GEARMAN_COMMAND_RESET_ABILITIES,
-                                  NULL, NULL, 0);
-  if (ret != GEARMAN_SUCCESS)
+  gearman_return_t ret= gearman_packet_create_args(worker->universal,
+						   &(worker->function_list->packet),
+						   GEARMAN_MAGIC_REQUEST,
+						   GEARMAN_COMMAND_RESET_ABILITIES,
+						   NULL, NULL, 0);
+  if (gearman_failed(ret))
   {
     worker->function_list->options.packet_in_use= false;
 
@@ -1062,17 +1062,15 @@ static gearman_worker_st *_worker_allocate(gearman_worker_st *worker, bool is_cl
 
 static gearman_return_t _worker_packet_init(gearman_worker_st *worker)
 {
-  gearman_return_t ret;
-
-  ret= gearman_packet_create_args((&worker->universal), &(worker->grab_job),
-                                  GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_GRAB_JOB,
-                                  NULL, NULL, 0);
+  gearman_return_t ret= gearman_packet_create_args(worker->universal, &(worker->grab_job),
+						   GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_GRAB_JOB,
+						   NULL, NULL, 0);
   if (gearman_failed(ret))
     return ret;
 
-  ret= gearman_packet_create_args((&worker->universal), &(worker->pre_sleep),
-                                  GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_PRE_SLEEP,
-                                  NULL, NULL, 0);
+  ret= gearman_packet_create_args(worker->universal, &(worker->pre_sleep),
+				  GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_PRE_SLEEP,
+				  NULL, NULL, 0);
   if (gearman_failed(ret))
   {
     gearman_packet_free(&(worker->grab_job));
@@ -1122,7 +1120,7 @@ static gearman_return_t _worker_function_create(gearman_worker_st *worker,
     args_size[0]= function->length() + 1;
     args[1]= timeout_buffer;
     args_size[1]= strlen(timeout_buffer);
-    ret= gearman_packet_create_args((&worker->universal), &(function->packet),
+    ret= gearman_packet_create_args(worker->universal, &(function->packet),
                                     GEARMAN_MAGIC_REQUEST,
                                     GEARMAN_COMMAND_CAN_DO_TIMEOUT,
                                     args, args_size, 2);
@@ -1131,9 +1129,9 @@ static gearman_return_t _worker_function_create(gearman_worker_st *worker,
   {
     args[0]= function->name();
     args_size[0]= function->length();
-    ret= gearman_packet_create_args((&worker->universal), &(function->packet),
-                                    GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_CAN_DO,
-                                    args, args_size, 1);
+    ret= gearman_packet_create_args(worker->universal, &(function->packet),
+				    GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_CAN_DO,
+				    args, args_size, 1);
   }
 
   if (gearman_failed(ret))

tests/regression.cc

@@ -44,14 +44,15 @@
 # undef NDEBUG
 #endif
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #define GEARMAN_CORE
 
 #include <libgearman/common.h>
+#include <libgearman/packet.hpp>
 #include <libgearman/universal.hpp>
 
 #include <libtest/test.h>
@@ -91,12 +92,9 @@ static test_return_t bug372074_test(void *)
 
     args[0]= "testUnregisterFunction";
     args_size[0]= strlen("testUnregisterFunction");
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
-                                   GEARMAN_COMMAND_SET_CLIENT_ID,
-                                   args, args_size, 1) != GEARMAN_SUCCESS)
-    {
-      return TEST_FAILURE;
-    }
+    test_truth(gearman_success(gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
+                                                          GEARMAN_COMMAND_SET_CLIENT_ID,
+                                                          args, args_size, 1)));
 
     if (gearman_connection_send(&con, &packet, true) != GEARMAN_SUCCESS)
       return TEST_FAILURE;
@@ -105,24 +103,16 @@ static test_return_t bug372074_test(void *)
 
     args[0]= "reverse";
     args_size[0]= strlen("reverse");
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
-                                   GEARMAN_COMMAND_CAN_DO,
-                                   args, args_size, 1) != GEARMAN_SUCCESS)
-    {
-      return TEST_FAILURE;
-    }
+    test_truth(gearman_success(gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST, GEARMAN_COMMAND_CAN_DO,
+                                                          args, args_size, 1)));
 
-    if (gearman_connection_send(&con, &packet, true) != GEARMAN_SUCCESS)
-      return TEST_FAILURE;
+    test_truth(gearman_success(gearman_connection_send(&con, &packet, true)));
 
     gearman_packet_free(&packet);
 
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
-                                   GEARMAN_COMMAND_CANT_DO,
-                                   args, args_size, 1) != GEARMAN_SUCCESS)
-    {
-      return TEST_FAILURE;
-    }
+    test_truth(gearman_success(gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
+                                                          GEARMAN_COMMAND_CANT_DO,
+                                                          args, args_size, 1)));
 
     test_truth(gearman_success(gearman_connection_send(&con, &packet, true)));
 
@@ -136,7 +126,7 @@ static test_return_t bug372074_test(void *)
 
     args[0]= "testUnregisterFunction";
     args_size[0]= strlen("testUnregisterFunction");
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
+    if (gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
                                    GEARMAN_COMMAND_SET_CLIENT_ID,
                                    args, args_size, 1) != GEARMAN_SUCCESS)
     {
@@ -150,7 +140,7 @@ static test_return_t bug372074_test(void *)
 
     args[0]= "digest";
     args_size[0]= strlen("digest");
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
+    if (gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
                                    GEARMAN_COMMAND_CAN_DO,
                                    args, args_size, 1) != GEARMAN_SUCCESS)
     {
@@ -164,7 +154,7 @@ static test_return_t bug372074_test(void *)
 
     args[0]= "reverse";
     args_size[0]= strlen("reverse");
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
+    if (gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
                                    GEARMAN_COMMAND_CAN_DO,
                                    args, args_size, 1) != GEARMAN_SUCCESS)
     {
@@ -176,7 +166,7 @@ static test_return_t bug372074_test(void *)
 
     gearman_packet_free(&packet);
 
-    if (gearman_packet_create_args(&universal, &packet, GEARMAN_MAGIC_REQUEST,
+    if (gearman_packet_create_args(universal, &packet, GEARMAN_MAGIC_REQUEST,
                                    GEARMAN_COMMAND_RESET_ABILITIES,
                                    NULL, NULL, 0) != GEARMAN_SUCCESS)
     {