First version of replication.

[awesomized/libmemcached] / lib / memcached_fetch_execute.c

diff --git a/lib/memcached_fetch_execute.c b/lib/memcached_fetch_execute.c
index c1245d4fd1786fbfc7d1e2e7646b4a6c09e119dc..29d76244387ea022ba9f07c21a42a51b51f3b3b8 100644 (file)
--- a/lib/memcached_fetch_execute.c
+++ b/lib/memcached_fetch_execute.c
@@ -1,7 +1,7 @@
 #include "common.h"
 
 memcached_return memcached_fetch_execute(memcached_st *ptr, 
-                                             unsigned int (*callback[])(memcached_st *ptr, memcached_result_st *result, void *context),
+                                             memcached_execute_function *callback,
                                              void *context,
                                              unsigned int number_of_callbacks
                                              )
@@ -14,17 +14,17 @@ memcached_return memcached_fetch_execute(memcached_st *ptr,
 
     char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
 
-    if (memcached_server_response_count(ptr, ptr->cursor_server) == 0)
+    if (memcached_server_response_count(&ptr->hosts[ptr->cursor_server]) == 0)
     {
       ptr->cursor_server++;
       continue;
     }
 
-    rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result, ptr->cursor_server);
+    rc= memcached_response(&ptr->hosts[ptr->cursor_server], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, result);
 
     if (rc == MEMCACHED_END) /* END means that we move on to the next */
     {
-      memcached_server_response_reset(ptr, ptr->cursor_server);
+      memcached_server_response_reset(&ptr->hosts[ptr->cursor_server]);
       ptr->cursor_server++;
       continue;
     }
@@ -34,11 +34,11 @@ memcached_return memcached_fetch_execute(memcached_st *ptr,
 
       for (x= 0; x < number_of_callbacks; x++)
       {
-        unsigned int iferror;
+        memcached_return iferror;
 
         iferror= (*callback[x])(ptr, result, context);
 
-        if (iferror)
+        if (iferror != MEMCACHED_SUCCESS)
           continue;
       }
     }