Use nullptr instead of 0 for pointers

[libs/net.git] / source / net / communicator.h

diff --git a/source/net/communicator.h b/source/net/communicator.h
index af5ff58791ce1ad72a1d97c07591264927bfae64..822b16ef998dbd706d1ea1617950175d488496ca 100644 (file)
--- a/source/net/communicator.h
+++ b/source/net/communicator.h
@@ -1,6 +1,7 @@
 #ifndef MSP_NET_COMMUNICATOR_H_
 #define MSP_NET_COMMUNICATOR_H_
 
+#include <msp/core/except.h>
 #include <sigc++/signal.h>
 #include "protocol.h"
 
@@ -9,11 +10,16 @@ namespace Net {
 
 class StreamSocket;
 
-class sequence_error: public std::logic_error
+class sequence_error: public invalid_state
 {
 public:
-       sequence_error(const std::string &w): std::logic_error(w) { }
-       virtual ~sequence_error() throw() { }
+       sequence_error(const std::string &w): invalid_state(w) { }
+};
+
+class incompatible_protocol: public std::runtime_error
+{
+public:
+       incompatible_protocol(const std::string &w): std::runtime_error(w) { }
 };
 
 
@@ -27,13 +33,13 @@ private:
        StreamSocket &socket;
        const Protocol &protocol;
        ReceiverBase &receiver;
-       int handshake_status;
-       unsigned buf_size;
-       char *in_buf;
-       char *in_begin;
-       char *in_end;
-       char *out_buf;
-       bool good;
+       int handshake_status = 0;
+       std::size_t buf_size = 65536;
+       char *in_buf = nullptr;
+       char *in_begin = nullptr;
+       char *in_end = nullptr;
+       char *out_buf = nullptr;
+       bool good = true;
 
 public:
        Communicator(StreamSocket &, const Protocol &, ReceiverBase &);
@@ -46,7 +52,7 @@ public:
        void send(const P &);
 
 private:
-       void send_data(unsigned);
+       void send_data(std::size_t);
 
        void data_available();
        bool receive_packet(const Protocol &, ReceiverBase &);