projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updating for version .32
[awesomized/libmemcached]
/
libmemcached
/
memcached_quit.c
diff --git
a/libmemcached/memcached_quit.c
b/libmemcached/memcached_quit.c
index c93cb1883ac17dbadfe818a02fe43caf3dbe926c..9a200a1ee935041b6386a82aacb6d00e505bdd25 100644
(file)
--- a/
libmemcached/memcached_quit.c
+++ b/
libmemcached/memcached_quit.c
@@
-16,7
+16,6
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
{
memcached_return rc;
if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
{
memcached_return rc;
- ssize_t read_length;
char buffer[MEMCACHED_MAX_BUFFER];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
char buffer[MEMCACHED_MAX_BUFFER];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
@@
-37,14
+36,14
@@
void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
* results in server throwing away all data which is
* not read
*/
* results in server throwing away all data which is
* not read
*/
- while ((read_length=
- memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
-
> 0
);
+ ssize_t nread;
+ while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
+
&nread) == MEMCACHED_SUCCESS
);
}
memcached_io_close(ptr);
ptr->fd= -1;
}
memcached_io_close(ptr);
ptr->fd= -1;
- ptr->write_buffer_offset= (
ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0
;
+ ptr->write_buffer_offset= (
size_t) ((ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0)
;
ptr->read_buffer_length= 0;
ptr->read_ptr= ptr->read_buffer;
memcached_server_response_reset(ptr);
ptr->read_buffer_length= 0;
ptr->read_ptr= ptr->read_buffer;
memcached_server_response_reset(ptr);