Style cleanup

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index fa35d84e5af49cd35edbbd89598fe09c948eb7e5..5a0083f4c8ff32cb9257c4c337e74bcd73f7b9a7 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -43,8 +43,8 @@
 static memcached_return_t connect_poll(memcached_server_st *ptr)
 {
   struct pollfd fds[1];
-  fds[0].fd = ptr->fd;
-  fds[0].events = POLLOUT;
+  fds[0].fd= ptr->fd;
+  fds[0].events= POLLOUT;
 
   size_t loop_max= 5;
 
@@ -186,7 +186,7 @@ static memcached_return_t set_hostinfo(memcached_server_st *server)
 static inline void set_socket_nonblocking(memcached_server_st *ptr)
 {
 #ifdef WIN32
-  u_long arg = 1;
+  u_long arg= 1;
   if (ioctlsocket(ptr->fd, FIONBIO, &arg) == SOCKET_ERROR)
   {
     memcached_set_errno(*ptr, get_socket_errno(), NULL);

diff --git a/tests/mem_functions.cc b/tests/mem_functions.cc
index d691cbc57dd5f6186c686d3bb211c776d152bb33..492467ca31a33518333cf4076dfb6cacdabfbc77 100644 (file)
--- a/tests/mem_functions.cc
+++ b/tests/mem_functions.cc
@@ -1278,7 +1278,7 @@ static test_return_t mget_end(memcached_st *memc)
 
   // this should indicate end
   string= memcached_fetch(memc, key, &key_length, &string_length, &flags, &rc);
-  test_true(rc == MEMCACHED_END);
+  test_compare(MEMCACHED_END, rc);
 
   return TEST_SUCCESS;
 }
@@ -2622,8 +2622,7 @@ static test_return_t user_supplied_bug10(memcached_st *memc)
 
   memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_NO_BLOCK, set);
   memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_TCP_NODELAY, set);
-  int32_t timeout= 0;
-  memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, (uint64_t)timeout);
+  memcached_behavior_set(mclone, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, uint64_t(0));
 
   char *value= (char*)malloc(value_length * sizeof(char));