X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fparse.cc;h=12431222e3dfea0c72215484d1ebb28af13d7815;hb=eee6dc552da08a46e7f086b37cc697dacdc4627b;hp=373804654f1de31c08e641853bf0f636730dd07c;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached

diff --git a/src/libmemcached/parse.cc b/src/libmemcached/parse.cc
index 37380465..12431222 100644
--- a/src/libmemcached/parse.cc
+++ b/src/libmemcached/parse.cc
@@ -26,8 +26,8 @@ memcached_server_list_st memcached_servers_parse(const char *server_strings) {
 
   end_ptr = server_strings + strlen(server_strings);
 
-  for (begin_ptr = server_strings, string = (char *) index(server_strings, ',');
-       begin_ptr != end_ptr; string = (char *) index(begin_ptr, ','))
+  for (begin_ptr = server_strings, string = (char *) strchr(server_strings, ',');
+       begin_ptr != end_ptr; string = (char *) strchr(begin_ptr, ','))
   {
     char buffer[HUGE_STRING_LEN];
     char *ptr, *ptr2;
@@ -44,7 +44,7 @@ memcached_server_list_st memcached_servers_parse(const char *server_strings) {
       begin_ptr = end_ptr;
     }
 
-    ptr = index(buffer, ':');
+    ptr = strchr(buffer, ':');
 
     in_port_t port = 0;
     if (ptr) {
@@ -54,20 +54,20 @@ memcached_server_list_st memcached_servers_parse(const char *server_strings) {
 
       errno = 0;
       port = (in_port_t) strtoul(ptr, (char **) NULL, 10);
-      if (errno != 0) {
+      if (errno) {
         memcached_server_free(servers);
         return NULL;
       }
 
-      ptr2 = index(ptr, ' ');
+      ptr2 = strchr(ptr, ' ');
       if (!ptr2)
-        ptr2 = index(ptr, ':');
+        ptr2 = strchr(ptr, ':');
 
       if (ptr2) {
         ptr2++;
         errno = 0;
         weight = uint32_t(strtoul(ptr2, (char **) NULL, 10));
-        if (errno != 0) {
+        if (errno) {
           memcached_server_free(servers);
           return NULL;
         }