projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Bunch of fixes related to portability.
[m6w6/libmemcached]
/
lib
/
memcached_storage.c
diff --git
a/lib/memcached_storage.c
b/lib/memcached_storage.c
index 484341c842c286ad2dd8fd106cc5ebfe328f70e7..499fb7c8e947e18f76e5fda784a5c2a90d361534 100644
(file)
--- a/
lib/memcached_storage.c
+++ b/
lib/memcached_storage.c
@@
-22,10
+22,10
@@
static memcached_return memcached_send(memcached_st *ptr,
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
unsigned int server_key;
- rc= memcached_connect(ptr);
assert(value);
assert(value_length);
assert(value);
assert(value_length);
+ rc= memcached_connect(ptr);
if (rc != MEMCACHED_SUCCESS)
return rc;
if (rc != MEMCACHED_SUCCESS)
return rc;
@@
-35,19
+35,21
@@
static memcached_return memcached_send(memcached_st *ptr,
"%s %.*s %x %llu %zu\r\n", verb,
(int)key_length, key, flags,
(unsigned long long)expiration, value_length);
"%s %.*s %x %llu %zu\r\n", verb,
(int)key_length, key, flags,
(unsigned long long)expiration, value_length);
- if ((sent_length= write(ptr->hosts[server_key].fd, buffer, write_length)) == -1)
+ if (write_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
+ return MEMCACHED_WRITE_FAILURE;
+ if ((sent_length= send(ptr->hosts[server_key].fd, buffer, write_length, 0)) == -1)
return MEMCACHED_WRITE_FAILURE;
assert(write_length == sent_length);
return MEMCACHED_WRITE_FAILURE;
assert(write_length == sent_length);
- if ((sent_length=
write(ptr->hosts[server_key].fd, value, value_length
)) == -1)
+ if ((sent_length=
send(ptr->hosts[server_key].fd, value, value_length, 0
)) == -1)
return MEMCACHED_WRITE_FAILURE;
assert(value_length == sent_length);
return MEMCACHED_WRITE_FAILURE;
assert(value_length == sent_length);
- if ((sent_length=
write(ptr->hosts[server_key].fd, "\r\n", 2
)) == -1)
+ if ((sent_length=
send(ptr->hosts[server_key].fd, "\r\n", 2, 0
)) == -1)
return MEMCACHED_WRITE_FAILURE;
assert(2 == sent_length);
return MEMCACHED_WRITE_FAILURE;
assert(2 == sent_length);
- sent_length= re
ad(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE
);
+ sent_length= re
cv(ptr->hosts[server_key].fd, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, 0
);
if (sent_length && buffer[0] == 'S') /* STORED */
return MEMCACHED_SUCCESS;
if (sent_length && buffer[0] == 'S') /* STORED */
return MEMCACHED_SUCCESS;