X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_hosts.c;h=f7a7dfcfe38a925ad332c45f3172373d17661f5e;hb=eef0b72fc61709c75274bae8a3240824482a8302;hp=13604d33b95ceb95f50b259c62f627d4551c0d82;hpb=8a5081c5ed9c33b1d6d5f070ba97b2b21b7a0da8;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_hosts.c b/libmemcached/memcached_hosts.c
index 13604d33..f7a7dfcf 100644
--- a/libmemcached/memcached_hosts.c
+++ b/libmemcached/memcached_hosts.c
@@ -2,7 +2,7 @@
 #include <math.h>
 
 /* Protoypes (static) */
-static memcached_return server_add(memcached_st *ptr, char *hostname, 
+static memcached_return server_add(memcached_st *ptr, const char *hostname, 
                                    unsigned int port,
                                    memcached_connection type);
 memcached_return update_continuum(memcached_st *ptr);
@@ -52,7 +52,7 @@ memcached_return run_distribution(memcached_st *ptr)
 }
 
 void host_reset(memcached_st *ptr, memcached_server_st *host, 
-                char *hostname, unsigned int port,
+                const char *hostname, unsigned int port,
                 memcached_connection type)
 {
   memset(host,  0, sizeof(memcached_server_st));
@@ -152,7 +152,11 @@ memcached_return update_continuum(memcached_st *ptr)
         float pct = (float)list[host_index].limit_maxbytes/ (float)total_mem_bytes;
         pointer_per_server= floorf( pct * MEMCACHED_POINTS_PER_SERVER * (float)(ptr->number_of_hosts));
 #ifdef HAVE_DEBUG
-        printf("ketama_weighted:%s|%d|%llu|%u\n", list[host_index].hostname, list[host_index].port,  list[host_index].limit_maxbytes, pointer_per_server);
+        printf("ketama_weighted:%s|%d|%llu|%u\n", 
+               list[host_index].hostname, 
+               list[host_index].port,  
+               (unsigned long long)list[host_index].limit_maxbytes, 
+               pointer_per_server);
 #endif
     }
     for(index= 1; index <= pointer_per_server; ++index) 
@@ -228,7 +232,7 @@ memcached_return memcached_server_push(memcached_st *ptr, memcached_server_st *l
   return run_distribution(ptr);
 }
 
-memcached_return memcached_server_add_unix_socket(memcached_st *ptr, char *filename)
+memcached_return memcached_server_add_unix_socket(memcached_st *ptr, const char *filename)
 {
   if (!filename)
     return MEMCACHED_FAILURE;
@@ -237,7 +241,7 @@ memcached_return memcached_server_add_unix_socket(memcached_st *ptr, char *filen
 }
 
 memcached_return memcached_server_add_udp(memcached_st *ptr, 
-                                          char *hostname,
+                                          const char *hostname,
                                           unsigned int port)
 {
   if (!port)
@@ -250,7 +254,7 @@ memcached_return memcached_server_add_udp(memcached_st *ptr,
 }
 
 memcached_return memcached_server_add(memcached_st *ptr, 
-                                      char *hostname, 
+                                      const char *hostname, 
                                       unsigned int port)
 {
   if (!port)
@@ -262,7 +266,7 @@ memcached_return memcached_server_add(memcached_st *ptr,
   return server_add(ptr, hostname, port, MEMCACHED_CONNECTION_TCP);
 }
 
-static memcached_return server_add(memcached_st *ptr, char *hostname, 
+static memcached_return server_add(memcached_st *ptr, const char *hostname, 
                                    unsigned int port,
                                    memcached_connection type)
 {
@@ -313,7 +317,7 @@ memcached_return memcached_server_remove(memcached_server_st *st_ptr)
 }
 
 memcached_server_st *memcached_server_list_append(memcached_server_st *ptr, 
-                                                  char *hostname, unsigned int port, 
+                                                  const char *hostname, unsigned int port, 
                                                   memcached_return *error)
 {
   unsigned int count;