Style cleanup

[m6w6/libmemcached] / libmemcached / memcached_fetch.c

diff --git a/libmemcached/memcached_fetch.c b/libmemcached/memcached_fetch.c
index dc253ca2fa8683e9ccd206656ebde1ca42f15885..dbb1ff62e931b51e9c22a50062122205c4e9333c 100644 (file)
--- a/libmemcached/memcached_fetch.c
+++ b/libmemcached/memcached_fetch.c
@@ -4,11 +4,11 @@
 char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length, 
                       size_t *value_length, 
                       uint32_t *flags,
-                      memcached_return *error)
+                      memcached_return_t *error)
 {
   memcached_result_st *result_buffer= &ptr->result;
 
-  unlikely (ptr->flags & MEM_USE_UDP)
+  unlikely (ptr->flags.use_udp)
   {
     *error= MEMCACHED_NOT_SUPPORTED;
     return NULL;
@@ -41,11 +41,11 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
 
 memcached_result_st *memcached_fetch_result(memcached_st *ptr,
                                             memcached_result_st *result,
-                                            memcached_return *error)
+                                            memcached_return_t *error)
 {
   memcached_server_st *server;
 
-  unlikely (ptr->flags & MEM_USE_UDP)
+  unlikely (ptr->flags.use_udp)
   {
     *error= MEMCACHED_NOT_SUPPORTED;
     return NULL;
@@ -81,13 +81,13 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
   return NULL;
 }
 
-memcached_return memcached_fetch_execute(memcached_st *ptr, 
-                                         memcached_execute_function *callback,
-                                         void *context,
-                                         unsigned int number_of_callbacks)
+memcached_return_t memcached_fetch_execute(memcached_st *ptr, 
+                                           memcached_execute_fn *callback,
+                                           void *context,
+                                           uint32_t number_of_callbacks)
 {
   memcached_result_st *result= &ptr->result;
-  memcached_return rc= MEMCACHED_FAILURE;
+  memcached_return_t rc= MEMCACHED_FAILURE;
   unsigned int x;
 
   while ((result= memcached_fetch_result(ptr, result, &rc)) != NULL)