Merge pull request #1825 from bluca/whitespace_and_werror

src/encoder.hpp

@@ -57,11 +57,11 @@ namespace zmq
     public:
 
         inline encoder_base_t (size_t bufsize_) :
-            bufsize (bufsize_),
             write_pos(0),
             to_write(0),
-			next(nullptr),
+            next(NULL),
             new_msg_flag(false),
+            bufsize (bufsize_),
             in_progress (NULL)
         {
             buf = (unsigned char*) malloc (bufsize_);

src/poller_base.cpp

@@ -53,7 +53,7 @@ void zmq::poller_base_t::adjust_load (int amount_)
         load.add (amount_);
     else
     if (amount_ < 0)
-        bool reset = load.sub (-amount_);
+        load.sub (-amount_);
 }
 
 void zmq::poller_base_t::add_timer (int timeout_, i_poll_events *sink_, int id_)

src/reaper.cpp

@@ -35,8 +35,8 @@
 
 zmq::reaper_t::reaper_t (class ctx_t *ctx_, uint32_t tid_) :
     object_t (ctx_, tid_),
-    sockets (0),
     mailbox_handle(NULL),
+    sockets (0),
     terminating (false)
 {
     poller = new (std::nothrow) poller_t (*ctx_);

src/socket_base.cpp

@@ -184,6 +184,8 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
     tag (0xbaddecaf),
     ctx_terminated (false),
     destroyed (false),
+    poller(NULL),
+    handle(NULL),
     last_tsc (0),
     ticks (0),
     rcvmore (false),
@@ -191,8 +193,6 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_, uint32_t tid_, int sid_, bool
     monitor_socket (NULL),
     monitor_events (0),
     thread_safe (thread_safe_),
-	poller(nullptr),
-	handle(NULL),
     reaper_signaler (NULL)
 {
     options.socket_id = sid_;
@@ -1503,9 +1503,8 @@ void zmq::socket_base_t::in_event ()
     if (thread_safe)
         reaper_signaler->recv();
 
-    int rc = process_commands (0, false);
+    process_commands (0, false);
     EXIT_MUTEX();
-	errno_assert(rc == 0);
     check_destroy();
 }
 

src/socket_poller.cpp

@@ -34,19 +34,20 @@
 zmq::socket_poller_t::socket_poller_t () :
     tag (0xCAFEBABE),
     need_rebuild (true),
-	poll_size(0),
-	maxfd(0),
-    use_signaler (false)
+    use_signaler (false),
+    poll_size(0)
 #if defined ZMQ_POLL_BASED_ON_POLL
     ,
     pollfds (NULL)
+#elif defined ZMQ_POLL_BASED_ON_SELECT
+    ,
+    maxfd(0)
 #endif
 {
 #if defined ZMQ_POLL_BASED_ON_SELECT
     memset(&pollset_in, 0, sizeof(pollset_in));
     memset(&pollset_out, 0, sizeof(pollset_in));
     memset(&pollset_err, 0, sizeof(pollset_in));
-	maxfd = 0;
 #endif
 }
 

src/socks_connecter.cpp

@@ -61,11 +61,11 @@ zmq::socks_connecter_t::socks_connecter_t (class io_thread_t *io_thread_,
     proxy_addr (proxy_addr_),
     status (unplugged),
     s (retired_fd),
-    delayed_start (delayed_start_),
-    session (session_),
     handle(NULL),
     handle_valid(false),
+    delayed_start (delayed_start_),
     timer_started(false),
+    session (session_),
     current_reconnect_ivl (options.reconnect_ivl)
 {
     zmq_assert (addr);

src/stream_engine.cpp

@@ -61,6 +61,8 @@
 zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
                                        const std::string &endpoint_) :
     s (fd_),
+    as_server(false),
+    handle(NULL),
     inpos (NULL),
     insize (0),
     decoder (NULL),
@@ -87,8 +89,6 @@ zmq::stream_engine_t::stream_engine_t (fd_t fd_, const options_t &options_,
     has_timeout_timer (false),
     has_heartbeat_timer (false),
     heartbeat_timeout (0),
-	as_server(false),
-	handle(NULL),
     socket (NULL)
 {
     int rc = tx_msg.init ();

src/tcp_connecter.cpp

@@ -67,12 +67,12 @@ zmq::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_,
     io_object_t (io_thread_),
     addr (addr_),
     s (retired_fd),
+    handle(NULL),
     handle_valid (false),
     delayed_start (delayed_start_),
     connect_timer_started (false),
     reconnect_timer_started (false),
     session (session_),
-	handle(NULL),
     current_reconnect_ivl (options.reconnect_ivl)
 {
     zmq_assert (addr);

src/thread.hpp

@@ -55,9 +55,8 @@ namespace zmq
     public:
 
         inline thread_t ()
-			: tfn(nullptr)
-			, arg(nullptr)
-			, descriptor(NULL)
+            : tfn(NULL)
+            , arg(NULL)
         {
         }
 

src/udp_engine.cpp

@@ -48,12 +48,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 zmq::udp_engine_t::udp_engine_t() :
     plugged (false),
-	fd(NULL),
-	address(nullptr),
-	send_enabled(false),
-	recv_enabled(false),
+    fd(-1),
+    session(NULL),
     handle(NULL),
-    session(NULL)
+    address(NULL),
+    send_enabled(false),
+    recv_enabled(false)
 {
 }