X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fparse.c;h=85860ef3301e50a093730252a36c54aabd787a68;hb=18ace40ddb7271f3f5e71965f74fe11d7754bd8f;hp=73cc9dfec7d79ef461f71c6a61621bb408c783fe;hpb=7c7750f02368b570353ea109f23a0ea26d226e02;p=awesomized%2Flibmemcached diff --git a/libmemcached/parse.c b/libmemcached/parse.c index 73cc9dfe..85860ef3 100644 --- a/libmemcached/parse.c +++ b/libmemcached/parse.c @@ -7,11 +7,9 @@ #include "common.h" -memcached_server_st *memcached_servers_parse(const char *server_strings) +memcached_server_list_st memcached_servers_parse(const char *server_strings) { char *string; - uint32_t port; - uint32_t weight; const char *begin_ptr; const char *end_ptr; memcached_server_st *servers= NULL; @@ -27,8 +25,7 @@ memcached_server_st *memcached_servers_parse(const char *server_strings) { char buffer[HUGE_STRING_LEN]; char *ptr, *ptr2; - port= 0; - weight= 0; + uint32_t weight= 0; if (string) { @@ -46,17 +43,19 @@ memcached_server_st *memcached_servers_parse(const char *server_strings) ptr= index(buffer, ':'); + in_port_t port= 0; if (ptr) { ptr[0]= 0; ptr++; - port= (uint32_t) strtoul(ptr, (char **)NULL, 10); + port= (in_port_t) strtoul(ptr, (char **)NULL, 10); ptr2= index(ptr, ' '); if (! ptr2) ptr2= index(ptr, ':'); + if (ptr2) { ptr2++;