|
|
|
@ -1,7 +1,39 @@
|
|
|
|
|
Index: src/SocketRecvBuffer.cc
|
|
|
|
|
--- src/SocketRecvBuffer.cc.orig 2011-02-11 10:54:02.000000000 +0100
|
|
|
|
|
+++ src/SocketRecvBuffer.cc 2011-03-19 11:14:14.000000000 +0100
|
|
|
|
|
@@ -35,6 +35,7 @@
|
|
|
|
|
#include "SocketRecvBuffer.h"
|
|
|
|
|
|
|
|
|
|
#include <cstring>
|
|
|
|
|
+#include <unistd.h>
|
|
|
|
|
|
|
|
|
|
#include "SocketCore.h"
|
|
|
|
|
#include "LogFactory.h"
|
|
|
|
|
@@ -55,7 +56,7 @@
|
|
|
|
|
delete [] buf_;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-ssize_t SocketRecvBuffer::recv()
|
|
|
|
|
+size_t SocketRecvBuffer::recv()
|
|
|
|
|
{
|
|
|
|
|
size_t len = capacity_-bufLen_;
|
|
|
|
|
if(len > 0) {
|
|
|
|
|
Index: src/SocketRecvBuffer.h
|
|
|
|
|
--- src/SocketRecvBuffer.h.orig 2011-02-11 10:54:02.000000000 +0100
|
|
|
|
|
+++ src/SocketRecvBuffer.h 2011-03-19 11:14:26.000000000 +0100
|
|
|
|
|
@@ -50,7 +50,7 @@
|
|
|
|
|
~SocketRecvBuffer();
|
|
|
|
|
// Reads data from socket as much as capacity allows. Returns the
|
|
|
|
|
// number of bytes read.
|
|
|
|
|
- ssize_t recv();
|
|
|
|
|
+ size_t recv();
|
|
|
|
|
// Shifts buffer by offset bytes. offset must satisfy offset <=
|
|
|
|
|
// getBufferLength().
|
|
|
|
|
void shiftBuffer(size_t offset);
|
|
|
|
|
Index: test/FileTest.cc
|
|
|
|
|
--- test/FileTest.cc.orig 2009-02-15 15:54:55 +0100
|
|
|
|
|
+++ test/FileTest.cc 2009-03-27 10:22:38 +0100
|
|
|
|
|
@@ -130,18 +130,6 @@
|
|
|
|
|
--- test/FileTest.cc.orig 2011-02-12 10:20:07.000000000 +0100
|
|
|
|
|
+++ test/FileTest.cc 2011-03-18 22:47:23.000000000 +0100
|
|
|
|
|
@@ -149,18 +149,6 @@
|
|
|
|
|
void FileTest::testGetDirname()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
@ -20,7 +52,7 @@ Index: test/FileTest.cc
|
|
|
|
|
File f("/");
|
|
|
|
|
CPPUNIT_ASSERT_EQUAL(std::string("/"), f.getDirname());
|
|
|
|
|
}
|
|
|
|
|
@@ -162,18 +150,6 @@
|
|
|
|
|
@@ -181,18 +169,6 @@
|
|
|
|
|
void FileTest::testGetBasename()
|
|
|
|
|
{
|
|
|
|
|
{
|
|
|
|
|