projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge from build trunk.
[awesomized/libmemcached]
/
libmemcached
/
io.cc
diff --git
a/libmemcached/io.cc
b/libmemcached/io.cc
index ae86fa217b9f2902f3b64db4939ce685b4f06853..7a321adeed1f4ee7ca6a38b57b43f84b7595105e 100644
(file)
--- a/
libmemcached/io.cc
+++ b/
libmemcached/io.cc
@@
-419,7
+419,7
@@
memcached_return_t memcached_io_wait_for_write(memcached_server_write_instance_s
}
memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
}
memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
- void *buffer, size_t length, ssize_t
*
nread)
+ void *buffer, size_t length, ssize_t
&
nread)
{
assert_msg(ptr, "Programmer error, memcached_io_read() recieved an invalid memcached_server_write_instance_st"); // Programmer error
char *buffer_ptr= static_cast<char *>(buffer);
{
assert_msg(ptr, "Programmer error, memcached_io_read() recieved an invalid memcached_server_write_instance_st"); // Programmer error
char *buffer_ptr= static_cast<char *>(buffer);
@@
-475,7
+475,7
@@
memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
default:
{
memcached_quit_server(ptr, true);
default:
{
memcached_quit_server(ptr, true);
-
*
nread= -1;
+ nread= -1;
return memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
}
}
return memcached_set_errno(*ptr, get_socket_errno(), MEMCACHED_AT);
}
}
@@
-493,8
+493,8
@@
memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
*/
WATCHPOINT_STRING("We had a zero length recv()");
memcached_quit_server(ptr, true);
*/
WATCHPOINT_STRING("We had a zero length recv()");
memcached_quit_server(ptr, true);
-
*
nread= -1;
- return memcached_set_error(*ptr, MEMCACHED_
UNKNOWN_READ
_FAILURE, MEMCACHED_AT,
+ nread= -1;
+ return memcached_set_error(*ptr, MEMCACHED_
CONNECTION
_FAILURE, MEMCACHED_AT,
memcached_literal_param("::rec() returned zero, server has disconnected"));
}
} while (data_read <= 0);
memcached_literal_param("::rec() returned zero, server has disconnected"));
}
} while (data_read <= 0);
@@
-527,7
+527,7
@@
memcached_return_t memcached_io_read(memcached_server_write_instance_st ptr,
}
}
}
}
-
*nread = (ssize_t)
(buffer_ptr - (char*)buffer);
+
nread= ssize_t
(buffer_ptr - (char*)buffer);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-661,21
+661,9
@@
ssize_t memcached_io_write(memcached_server_write_instance_st ptr,
return _io_write(ptr, buffer, length, with_flush);
}
return _io_write(ptr, buffer, length, with_flush);
}
-size_t io_vector_total_size(libmemcached_io_vector_st* vector, const size_t number_of)
-{
- ssize_t total= 0;
-
- for (size_t x= 0; x < number_of; x++)
- {
- total+= vector->length;
- }
-
- return total;
-}
-
ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
ssize_t memcached_io_writev(memcached_server_write_instance_st ptr,
-
const struct libmemcached_io_vector_st *vector
,
-
size_t number_of,
bool with_flush)
+
libmemcached_io_vector_st vector[]
,
+
const size_t number_of, const
bool with_flush)
{
ssize_t total= 0;
{
ssize_t total= 0;
@@
-822,14
+810,14
@@
memcached_return_t memcached_safe_read(memcached_server_write_instance_st ptr,
ssize_t nread;
memcached_return_t rc;
ssize_t nread;
memcached_return_t rc;
- while (memcached_continue(rc= memcached_io_read(ptr, data + offset, size - offset,
&
nread))) { };
+ while (memcached_continue(rc= memcached_io_read(ptr, data + offset, size - offset, nread))) { };
if (memcached_failed(rc))
{
return rc;
}
if (memcached_failed(rc))
{
return rc;
}
- offset+=
(size_t) nread
;
+ offset+=
size_t(nread)
;
}
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
@@
-853,7
+841,7
@@
memcached_return_t memcached_io_readline(memcached_server_write_instance_st ptr,
* the logic.
*/
ssize_t nread;
* the logic.
*/
ssize_t nread;
- memcached_return_t rc= memcached_io_read(ptr, buffer_ptr, 1,
&
nread);
+ memcached_return_t rc= memcached_io_read(ptr, buffer_ptr, 1, nread);
if (memcached_failed(rc) and rc == MEMCACHED_IN_PROGRESS)
{
memcached_quit_server(ptr, true);
if (memcached_failed(rc) and rc == MEMCACHED_IN_PROGRESS)
{
memcached_quit_server(ptr, true);