Style/etc cleanup in server.

libgearman-server/connection.cc

@@ -183,7 +183,7 @@ void gearman_server_con_attempt_free(gearman_server_con_st *con)
 
   if (Server->flags.threaded)
   {
-    if (!(con->proc_removed) && !(Server->proc_shutdown))
+    if (!(con->proc_removed) and !(Server->proc_shutdown))
     {
       gearman_server_con_delete_timeout(con);
       con->is_dead= true;
@@ -202,7 +202,6 @@ void gearman_server_con_attempt_free(gearman_server_con_st *con)
 void gearman_server_con_free(gearman_server_con_st *con)
 {
   gearman_server_thread_st *thread= con->thread;
-  gearman_server_packet_st *packet;
   con->_host= NULL;
   con->_port= NULL;
 
@@ -235,7 +234,7 @@ void gearman_server_con_free(gearman_server_con_st *con)
 
   while (con->proc_packet_list != NULL)
   {
-    packet= gearman_server_proc_packet_remove(con);
+    gearman_server_packet_st* packet= gearman_server_proc_packet_remove(con);
     gearmand_packet_free(&(packet->packet));
     gearman_server_packet_free(packet, con->thread, true);
   }

libgearman-server/connection_list.h

@@ -46,15 +46,9 @@ struct gearmand_io_st;
 extern "C" {
 #endif
 
-typedef struct gearmand_connection_list_st gearmand_connection_list_st;
-
-GEARMAN_INTERNAL_API
-void gearmand_connection_list_init(gearmand_connection_list_st *source, gearmand_event_watch_fn *watch_fn, void *watch_context);
-
 /*
   Get next connection that is ready for I/O.
 */
-GEARMAN_INTERNAL_API
 gearman_server_con_st *gearmand_ready(gearmand_connection_list_st *gearman);
 
 #ifdef __cplusplus

libgearman-server/constants.h

@@ -89,25 +89,21 @@
 
 /** @} */
 
-typedef enum
+enum gearmand_connection_options_t
 {
   GEARMAND_CON_READY,
   GEARMAND_CON_PACKET_IN_USE,
   GEARMAND_CON_EXTERNAL_FD,
   GEARMAND_CON_CLOSE_AFTER_FLUSH,
   GEARMAND_CON_MAX
-} gearmand_connection_options_t;
+};
 
 
-#ifdef __cplusplus
-
 struct gearman_server_thread_st;
 struct gearman_server_st;
 struct gearman_server_con_st;
 struct gearmand_io_st;
 
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

libgearman-server/gearmand.h

@@ -45,7 +45,6 @@
 #pragma once
 
 #include <netinet/in.h>
-#include <stdbool.h>
 #include <stdlib.h>
 #include <poll.h>
 

libgearman-server/io.cc

@@ -416,8 +416,8 @@ void gearmand_io_free(gearmand_io_st *connection)
 }
 
 gearmand_error_t gearman_io_set_option(gearmand_io_st *connection,
-                                               gearmand_connection_options_t options,
-                                               bool value)
+                                       gearmand_connection_options_t options,
+                                       bool value)
 {
   switch (options)
   {

libgearman-server/io.h

@@ -78,11 +78,10 @@ extern "C" {
  * @return On success, a pointer to the (possibly allocated) structure. On
  *  failure this will be NULL.
  */
-GEARMAN_INTERNAL_API
-  void gearmand_connection_init(gearmand_connection_list_st *gearman,
-                                gearmand_io_st *connection,
-                                struct gearmand_con_st *dcon,
-                                gearmand_connection_options_t *options);
+void gearmand_connection_init(gearmand_connection_list_st *gearman,
+                              gearmand_io_st *connection,
+                              struct gearmand_con_st *dcon,
+                              gearmand_connection_options_t *options);
 
 /**
  * Free a connection structure.

libgearman-server/packet.cc

@@ -2,7 +2,7 @@
  * 
  *  Gearmand client and server library.
  *
- *  Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2011-2013 Data Differential, http://datadifferential.com/
  *  Copyright (C) 2008 Brian Aker, Eric Day
  *  All rights reserved.
  *
@@ -65,7 +65,7 @@ gearman_server_packet_create(gearman_server_thread_st *thread,
 {
   gearman_server_packet_st *server_packet= NULL;
 
-  if (from_thread && Server->flags.threaded)
+  if (from_thread and Server->flags.threaded)
   {
     if (thread->free_packet_count > 0)
     {

libgearman-server/struct/client.h

@@ -46,4 +46,14 @@ struct gearman_server_client_st
   gearman_server_job_st *job;
   gearman_server_client_st *job_next;
   gearman_server_client_st *job_prev;
+
+  gearman_server_client_st():
+    con(NULL),
+    con_next(NULL),
+    con_prev(NULL),
+    job(NULL),
+    job_next(NULL),
+    job_prev(NULL)
+  {
+  }
 };

libgearman-server/struct/io.h

@@ -86,6 +86,8 @@ struct gearmand_io_st
   gearman_server_con_st *root;
   char send_buffer[GEARMAN_SEND_BUFFER_SIZE];
   char recv_buffer[GEARMAN_RECV_BUFFER_SIZE];
+
+  gearmand_io_st() { }
 };
 
 namespace gearmand { namespace protocol {class Context; } }

libgearman-server/struct/packet.h

@@ -51,9 +51,14 @@ enum gearman_magic_t
  */
 struct gearmand_packet_st
 {
-  struct {
+  struct Options {
     bool complete;
     bool free_data;
+
+    Options() :
+      complete(false),
+      free_data(false)
+    { }
   } options;
   enum gearman_magic_t magic;
   enum gearman_command_t command;
@@ -67,10 +72,28 @@ struct gearmand_packet_st
   char *arg[GEARMAN_MAX_COMMAND_ARGS];
   size_t arg_size[GEARMAN_MAX_COMMAND_ARGS];
   char args_buffer[GEARMAN_ARGS_BUFFER_SIZE];
+
+  gearmand_packet_st():
+    magic(GEARMAN_MAGIC_TEXT),
+    command(GEARMAN_COMMAND_TEXT),
+    argc(0),
+    args_size(0),
+    data_size(0),
+    next(NULL),
+    prev(NULL),
+    args(0),
+    data(0)
+  {
+  }
 };
 
 struct gearman_server_packet_st
 {
   gearmand_packet_st packet;
   gearman_server_packet_st *next;
+
+  gearman_server_packet_st():
+    next(NULL)
+  {
+  }
 };