projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merged from build.
[m6w6/libmemcached]
/
libmemcached
/
io.c
diff --git
a/libmemcached/io.c
b/libmemcached/io.c
index 8f96bc32e19975f50bc74b459e0586fff99159fc..9f98b8b480cb3d32958bc39655ba835f968cbfab 100644
(file)
--- a/
libmemcached/io.c
+++ b/
libmemcached/io.c
@@
-333,7
+333,9
@@
ssize_t memcached_io_write(memcached_server_st *ptr,
memcached_return_t memcached_io_close(memcached_server_st *ptr)
{
memcached_return_t memcached_io_close(memcached_server_st *ptr)
{
+#ifdef DEBUG
int r;
int r;
+#endif
if (ptr->fd == -1)
return MEMCACHED_SUCCESS;
if (ptr->fd == -1)
return MEMCACHED_SUCCESS;
@@
-341,7
+343,10
@@
memcached_return_t memcached_io_close(memcached_server_st *ptr)
/* in case of death shutdown to avoid blocking at close() */
if (1)
{
/* in case of death shutdown to avoid blocking at close() */
if (1)
{
- r= shutdown(ptr->fd, SHUT_RDWR);
+#ifdef DEBUG
+ r=
+#endif
+ shutdown(ptr->fd, SHUT_RDWR);
#ifdef DEBUG
if (r && errno != ENOTCONN)
#ifdef DEBUG
if (r && errno != ENOTCONN)
@@
-353,7
+358,10
@@
memcached_return_t memcached_io_close(memcached_server_st *ptr)
#endif
}
#endif
}
- r= close(ptr->fd);
+#ifdef DEBUG
+ r=
+#endif
+ close(ptr->fd);
#ifdef DEBUG
if (r != 0)
WATCHPOINT_ERRNO(errno);
#ifdef DEBUG
if (r != 0)
WATCHPOINT_ERRNO(errno);