projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in all current libmemcached work, plus restore older, working,
[awesomized/libmemcached]
/
libmemcached
/
parse.c
diff --git
a/libmemcached/parse.c
b/libmemcached/parse.c
index 73cc9dfec7d79ef461f71c6a61621bb408c783fe..85860ef3301e50a093730252a36c54aabd787a68 100644
(file)
--- a/
libmemcached/parse.c
+++ b/
libmemcached/parse.c
@@
-7,11
+7,9
@@
#include "common.h"
#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;
{
char *string;
- uint32_t port;
- uint32_t weight;
const char *begin_ptr;
const char *end_ptr;
memcached_server_st *servers= NULL;
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;
{
char buffer[HUGE_STRING_LEN];
char *ptr, *ptr2;
- port= 0;
- weight= 0;
+ uint32_t weight= 0;
if (string)
{
if (string)
{
@@
-46,17
+43,19
@@
memcached_server_st *memcached_servers_parse(const char *server_strings)
ptr= index(buffer, ':');
ptr= index(buffer, ':');
+ in_port_t port= 0;
if (ptr)
{
ptr[0]= 0;
ptr++;
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, ':');
ptr2= index(ptr, ' ');
if (! ptr2)
ptr2= index(ptr, ':');
+
if (ptr2)
{
ptr2++;
if (ptr2)
{
ptr2++;