Use size_t to represent sizes

diff --git a/source/net/clientsocket.cpp b/source/net/clientsocket.cpp
index 04d07000a7bb1286c105a1697fdc71f0bc880901..e07b1f60bcfa887fca56b85939be5417376ea2a6 100644 (file)
--- a/source/net/clientsocket.cpp
+++ b/source/net/clientsocket.cpp
@@ -60,7 +60,7 @@ const SockAddr &ClientSocket::get_peer_address() const
        return *peer_addr;
 }
 
-unsigned ClientSocket::do_write(const char *buf, unsigned size)
+size_t ClientSocket::do_write(const char *buf, size_t size)
 {
        check_access(IO::M_WRITE);
        if(!connected)
@@ -72,7 +72,7 @@ unsigned ClientSocket::do_write(const char *buf, unsigned size)
        return check_sys_error(::send(priv->handle, buf, size, 0), "send");
 }
 
-unsigned ClientSocket::do_read(char *buf, unsigned size)
+size_t ClientSocket::do_read(char *buf, size_t size)
 {
        check_access(IO::M_READ);
        if(!connected)
@@ -81,7 +81,7 @@ unsigned ClientSocket::do_read(char *buf, unsigned size)
        if(size==0)
                return 0;
 
-       unsigned ret = check_sys_error(::recv(priv->handle, buf, size, 0), "recv");
+       size_t ret = check_sys_error(::recv(priv->handle, buf, size, 0), "recv");
        if(ret==0 && !eof_flag)
        {
                eof_flag = true;

diff --git a/source/net/clientsocket.h b/source/net/clientsocket.h
index 0b570cd7afa634357274d620a5b8980d22f025f9..ab8332235cabbaaa5144def7a049214cc9069244 100644 (file)
--- a/source/net/clientsocket.h
+++ b/source/net/clientsocket.h
@@ -42,8 +42,8 @@ public:
 
        const SockAddr &get_peer_address() const;
 protected:
-       virtual unsigned do_write(const char *, unsigned);
-       virtual unsigned do_read(char *, unsigned);
+       virtual std::size_t do_write(const char *, std::size_t);
+       virtual std::size_t do_read(char *, std::size_t);
 };
 
 } // namespace Net

diff --git a/source/net/communicator.cpp b/source/net/communicator.cpp
index 22a79631d9a214741fdbf71721d8e6322986ea4e..07a8494247758732e8e82597b621ae07b7f1fc21 100644 (file)
--- a/source/net/communicator.cpp
+++ b/source/net/communicator.cpp
@@ -84,7 +84,7 @@ void Communicator::initiate_handshake()
        handshake_status = 1;
 }
 
-void Communicator::send_data(unsigned size)
+void Communicator::send_data(size_t size)
 {
        if(!good)
                throw sequence_error("connection aborted");
@@ -161,7 +161,7 @@ bool Communicator::receive_packet(const Protocol &proto, ReceiverBase &recv)
        {
                if(in_end==in_buf+buf_size)
                {
-                       unsigned used = in_end-in_begin;
+                       size_t used = in_end-in_begin;
                        memmove(in_buf, in_begin, used);
                        in_begin = in_buf;
                        in_end = in_begin+used;
@@ -176,7 +176,7 @@ void Communicator::send_handshake()
        shake.hash = protocol.get_hash();
 
        HandshakeProtocol hsproto;
-       unsigned size = hsproto.serialize(shake, out_buf, buf_size);
+       size_t size = hsproto.serialize(shake, out_buf, buf_size);
        socket.write(out_buf, size);
 }
 

diff --git a/source/net/communicator.h b/source/net/communicator.h
index 63114fd9ba18cd09caa2124cca6b2119b6e1a7e8..e4869b29015ef0cf5146e0bea983506f3c569e4b 100644 (file)
--- a/source/net/communicator.h
+++ b/source/net/communicator.h
@@ -35,7 +35,7 @@ private:
        const Protocol &protocol;
        ReceiverBase &receiver;
        int handshake_status;
-       unsigned buf_size;
+       std::size_t buf_size;
        char *in_buf;
        char *in_begin;
        char *in_end;
@@ -53,7 +53,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 &);

diff --git a/source/net/datagramsocket.cpp b/source/net/datagramsocket.cpp
index fe01ef5c6a6ffc7e2419750679bfaed347238fd3..e92e28671f699639453172024fbee9c75c139ad9 100644 (file)
--- a/source/net/datagramsocket.cpp
+++ b/source/net/datagramsocket.cpp
@@ -33,7 +33,7 @@ bool DatagramSocket::connect(const SockAddr &addr)
        return true;
 }
 
-unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &addr)
+size_t DatagramSocket::sendto(const char *buf, size_t size, const SockAddr &addr)
 {
        if(size==0)
                return 0;
@@ -42,13 +42,13 @@ unsigned DatagramSocket::sendto(const char *buf, unsigned size, const SockAddr &
        return check_sys_error(::sendto(priv->handle, buf, size, 0, reinterpret_cast<const sockaddr *>(&sa.addr), sa.size), "sendto");
 }
 
-unsigned DatagramSocket::recvfrom(char *buf, unsigned size, SockAddr *&from_addr)
+size_t DatagramSocket::recvfrom(char *buf, size_t size, SockAddr *&from_addr)
 {
        if(size==0)
                return 0;
 
        SockAddr::SysAddr sa;
-       unsigned ret = check_sys_error(::recvfrom(priv->handle, buf, size, 0, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size), "recvfrom");
+       size_t ret = check_sys_error(::recvfrom(priv->handle, buf, size, 0, reinterpret_cast<sockaddr *>(&sa.addr), &sa.size), "recvfrom");
        from_addr = SockAddr::new_from_sys(sa);
 
        return ret;

diff --git a/source/net/datagramsocket.h b/source/net/datagramsocket.h
index 23ca296cbb27b93fb0735617209ff79f75d0066d..678a844b83fd9be16e139f49c8d59a1de4fddbea 100644 (file)
--- a/source/net/datagramsocket.h
+++ b/source/net/datagramsocket.h
@@ -14,8 +14,8 @@ public:
        virtual bool connect(const SockAddr &);
        virtual bool poll_connect(const Time::TimeDelta &) { return false; }
 
-       unsigned sendto(const char *, unsigned, const SockAddr &);
-       unsigned recvfrom(char *, unsigned, SockAddr *&);
+       std::size_t sendto(const char *, std::size_t, const SockAddr &);
+       std::size_t recvfrom(char *, std::size_t, SockAddr *&);
 };
 
 } // namespace Net

diff --git a/source/net/protocol.cpp b/source/net/protocol.cpp
index a152c559682541ded0234d77efa3fefad94537c2..f8bf4c3dd2fdd43c2d42a8f250d746ab44c545d7 100644 (file)
--- a/source/net/protocol.cpp
+++ b/source/net/protocol.cpp
@@ -49,7 +49,7 @@ const Protocol::PacketDefBase &Protocol::get_packet_by_id(unsigned id) const
        return *get_item(packet_id_defs, id);
 }
 
-unsigned Protocol::dispatch(ReceiverBase &rcv, const char *buf, unsigned size) const
+size_t Protocol::dispatch(ReceiverBase &rcv, const char *buf, size_t size) const
 {
        PacketHeader header;
        buf = header_def.deserialize(header, buf, buf+size);
@@ -60,7 +60,7 @@ unsigned Protocol::dispatch(ReceiverBase &rcv, const char *buf, unsigned size) c
        return ptr-buf;
 }
 
-unsigned Protocol::get_packet_size(const char *buf, unsigned size) const
+size_t Protocol::get_packet_size(const char *buf, size_t size) const
 {
        if(size<4)
                return 0;
@@ -87,7 +87,7 @@ char *Protocol::BasicSerializer<T>::serialize(const T &value, char *buf, char *e
                throw buffer_error("overflow");
 
        const char *ptr = reinterpret_cast<const char *>(&value)+sizeof(T);
-       for(unsigned i=0; i<sizeof(T); ++i)
+       for(size_t i=0; i<sizeof(T); ++i)
                *buf++ = *--ptr;
 
        return buf;
@@ -100,7 +100,7 @@ const char *Protocol::BasicSerializer<T>::deserialize(T &value, const char *buf,
                throw buffer_error("underflow");
 
        char *ptr = reinterpret_cast<char *>(&value)+sizeof(T);
-       for(unsigned i=0; i<sizeof(T); ++i)
+       for(size_t i=0; i<sizeof(T); ++i)
                *--ptr = *buf++;
 
        return buf;

diff --git a/source/net/protocol.h b/source/net/protocol.h
index 7beccfb0f49d42c1563d4b4296c79f39f62ae4ad..e078caff57ac8569d36a1fd24b3e5e1f2686f8fe 100644 (file)
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -256,10 +256,10 @@ protected:
 
 public:
        template<typename P>
-       unsigned serialize(const P &, char *, unsigned) const;
+       std::size_t serialize(const P &, char *, std::size_t) const;
 
-       unsigned get_packet_size(const char *, unsigned) const;
-       unsigned dispatch(ReceiverBase &, const char *, unsigned) const;
+       std::size_t get_packet_size(const char *, std::size_t) const;
+       std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
 
        UInt64 get_hash() const;
 
@@ -291,7 +291,7 @@ const Protocol::PacketTypeDef<P> &Protocol::get_packet_by_class() const
 }
 
 template<typename P>
-unsigned Protocol::serialize(const P &pkt, char *buf, unsigned size) const
+std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) const
 {
        const PacketTypeDef<P> &pdef = get_packet_by_class<P>();
        if(!pdef.get_id())

diff --git a/source/net/serversocket.cpp b/source/net/serversocket.cpp
index 60284837b1b91b5a95f6e98f9bcc9c6f3c4b40c0..051ac50574039d9fc1c2e407b9b791e345cb7a54 100644 (file)
--- a/source/net/serversocket.cpp
+++ b/source/net/serversocket.cpp
@@ -9,12 +9,12 @@ ServerSocket::ServerSocket(Family af, int type, int proto):
        Socket(af, type, proto)
 { }
 
-unsigned ServerSocket::do_write(const char *, unsigned)
+size_t ServerSocket::do_write(const char *, size_t)
 {
        throw logic_error("can't write to ServerSocket");
 }
 
-unsigned ServerSocket::do_read(char *, unsigned)
+size_t ServerSocket::do_read(char *, size_t)
 {
        throw logic_error("can't read from ServerSocket");
 }

diff --git a/source/net/serversocket.h b/source/net/serversocket.h
index 10375f03d15f0efc96c66f4d3d52dcde412795cd..dd892e02c446a1637e2afb525d4e7b68af2eaaf5 100644 (file)
--- a/source/net/serversocket.h
+++ b/source/net/serversocket.h
@@ -22,8 +22,8 @@ public:
 
        virtual ClientSocket *accept() = 0;
 protected:
-       virtual unsigned do_write(const char *, unsigned);
-       virtual unsigned do_read(char *, unsigned);
+       virtual std::size_t do_write(const char *, std::size_t);
+       virtual std::size_t do_read(char *, std::size_t);
 };
 
 } // namespace Net

diff --git a/source/net/socket_private.h b/source/net/socket_private.h
index 86ce587643e24b04262cc89564b5d236acb0d9c3..bb9eff6f1c280fbce695dbe4afaf37454a7c7845 100644 (file)
--- a/source/net/socket_private.h
+++ b/source/net/socket_private.h
@@ -27,7 +27,7 @@ struct Socket::Private
        int get_option(int, int, void *, socklen_t *);
 };
 
-unsigned check_sys_error(int, const char *);
+std::size_t check_sys_error(std::make_signed<std::size_t>::type, const char *);
 bool check_sys_connect_error(int);
 
 } // namespace Net

diff --git a/source/net/unix/socket.cpp b/source/net/unix/socket.cpp
index 970b9aedd3be443dff55e6500a296719041ea678..b8cc580f0040f7f16c1bf8adbc4668dce5a2c6ec 100644 (file)
--- a/source/net/unix/socket.cpp
+++ b/source/net/unix/socket.cpp
@@ -9,6 +9,8 @@
 #include "socket.h"
 #include "socket_private.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Net {
 
@@ -58,7 +60,7 @@ int Socket::Private::get_option(int level, int optname, void *optval, socklen_t
 }
 
 
-unsigned check_sys_error(int ret, const char *func)
+size_t check_sys_error(make_signed<size_t>::type ret, const char *func)
 {
        if(ret<0)
        {

diff --git a/source/net/windows/socket.cpp b/source/net/windows/socket.cpp
index 5094cc45644f929d9deb436ccdf0efc27daf0be0..dfcff623c328f4f03b2a7129a1931891a80c140b 100644 (file)
--- a/source/net/windows/socket.cpp
+++ b/source/net/windows/socket.cpp
@@ -6,6 +6,8 @@
 #include "socket.h"
 #include "socket_private.h"
 
+using namespace std;
+
 namespace {
 
 class WinSockHelper
@@ -85,7 +87,7 @@ int Socket::Private::get_option(int level, int optname, void *optval, socklen_t
 }
 
 
-unsigned check_sys_error(int ret, const char *func)
+size_t check_sys_error(make_signed<size_t>::type ret, const char *func)
 {
        if(ret<0)
        {