Fixed all warnings in code.

[awesomized/libmemcached] / src / utilities.c

diff --git a/src/utilities.c b/src/utilities.c
index 5dd66f62731d871651d16eb7a5232bc39797a006..c866dd54038f00960107b789786e4cdff4dbbe3a 100644 (file)
--- a/src/utilities.c
+++ b/src/utilities.c
@@ -1,14 +1,20 @@
 #include <memcached.h>
 
 void parse_opt_servers(memcached_st *memc,
-                       char *opt_servers)
+                       char *server_strings)
 {
   char *string;
   unsigned int port;
   char *begin_ptr;
+  char *end_ptr;
 
-  for (begin_ptr= opt_servers, string= index(opt_servers, ','); 
-       begin_ptr[0]; 
+  end_ptr= server_strings + strlen(server_strings);
+
+  assert(server_strings);
+  assert(memc);
+
+  for (begin_ptr= server_strings, string= index(server_strings, ','); 
+       begin_ptr == end_ptr; 
        begin_ptr= ++string, string= index(begin_ptr, ','))
   {
     char buffer[HUGE_STRING_LEN];
@@ -21,9 +27,9 @@ void parse_opt_servers(memcached_st *memc,
     }
     else
     {
-      size_t length= strlen(opt_servers);
+      size_t length= strlen(server_strings);
       memcpy(buffer, begin_ptr, length);
-      string= opt_servers+length;
+      string= server_strings+length;
     }
 
     ptr= index(buffer, ':');
@@ -44,4 +50,3 @@ void parse_opt_servers(memcached_st *memc,
     }
   }
 }
-