X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fsasl.cc;h=77c5fdf7b664295df1c6a1e97e79b862e22f340d;hb=fd8a1d785722f36d111915b0c96331e907df2746;hp=3aefb701f9bfd93cb0fa343f3cf7feeff5752f4c;hpb=4abccff8503dba0aafd6945a1aa028ec4bf3f0d1;p=m6w6%2Flibmemcached

diff --git a/libmemcached/sasl.cc b/libmemcached/sasl.cc
index 3aefb701..77c5fdf7 100644
--- a/libmemcached/sasl.cc
+++ b/libmemcached/sasl.cc
@@ -229,11 +229,11 @@ memcached_return_t memcached_sasl_authenticate_connection(memcached_server_st *s
   do {
     /* send the packet */
 
-    struct libmemcached_io_vector_st vector[]=
+    libmemcached_io_vector_st vector[]=
     {
-      { sizeof(request.bytes), request.bytes },
-      { keylen, chosenmech },
-      { len, data }
+      { request.bytes, sizeof(request.bytes) },
+      { chosenmech, keylen },
+      { data, len }
     };
 
     if (memcached_io_writev(server, vector, 3, true) == -1)
@@ -321,7 +321,7 @@ memcached_return_t memcached_set_sasl_auth_data(memcached_st *ptr,
 
   memcached_destroy_sasl_auth_data(ptr);
 
-  sasl_callback_t *callbacks= (sasl_callback_t*)libmemcached_calloc(ptr, 4, sizeof(sasl_callback_t));
+  sasl_callback_t *callbacks= libmemcached_xcalloc(ptr, 4, sasl_callback_t);
   size_t password_length= strlen(password);
   size_t username_length= strlen(username);
   char *name= (char *)libmemcached_malloc(ptr, username_length +1);
@@ -441,7 +441,7 @@ memcached_return_t memcached_clone_sasl(memcached_st *clone, const  memcached_st
     ++total;
   }
 
-  sasl_callback_t *callbacks= (sasl_callback_t*)libmemcached_calloc(clone, total +1, sizeof(sasl_callback_t));
+  sasl_callback_t *callbacks= libmemcached_xcalloc(clone, total +1, sasl_callback_t);
   if (callbacks == NULL)
   {
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;