X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_behavior.c;h=62b767f7b037a85ca473d142fec64e044ba58204;hb=4792e6fd1af5001670384301816fba0665dfa693;hp=55b9da670d75a184be9430faaf2a4d31876d0795;hpb=b1daf61bf1665041f30fff7c96d61de4658f8db3;p=m6w6%2Flibmemcached diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c index 55b9da67..62b767f7 100644 --- a/lib/memcached_behavior.c +++ b/lib/memcached_behavior.c @@ -108,7 +108,8 @@ unsigned long long memcached_behavior_get(memcached_st *ptr, temp_flag= MEM_USE_KETAMA; break; case MEMCACHED_BEHAVIOR_USER_DATA: - return (unsigned long long)ptr->user_data; + return 0; + //return (unsigned long long)ptr->user_data; case MEMCACHED_BEHAVIOR_POLL_TIMEOUT: { return (unsigned long long)ptr->poll_timeout; @@ -118,8 +119,9 @@ unsigned long long memcached_behavior_get(memcached_st *ptr, int sock_size; socklen_t sock_length= sizeof(int); + /* REFACTOR */ /* We just try the first host, and if it is down we return zero */ - if ((memcached_connect(ptr, 0)) != MEMCACHED_SUCCESS) + if ((memcached_connect(&ptr->hosts[0])) != MEMCACHED_SUCCESS) return 0; if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET, @@ -133,8 +135,9 @@ unsigned long long memcached_behavior_get(memcached_st *ptr, int sock_size; socklen_t sock_length= sizeof(int); + /* REFACTOR */ /* We just try the first host, and if it is down we return zero */ - if ((memcached_connect(ptr, 0)) != MEMCACHED_SUCCESS) + if ((memcached_connect(&ptr->hosts[0])) != MEMCACHED_SUCCESS) return 0; if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET,