projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
merge
[awesomized/libmemcached]
/
libmemcached
/
sasl.cc
diff --git
a/libmemcached/sasl.cc
b/libmemcached/sasl.cc
index 3aefb701f9bfd93cb0fa343f3cf7feeff5752f4c..2e9bdc635d547514f1ef557cd5642e2dfee602f7 100644
(file)
--- a/
libmemcached/sasl.cc
+++ b/
libmemcached/sasl.cc
@@
-231,9
+231,9
@@
memcached_return_t memcached_sasl_authenticate_connection(memcached_server_st *s
struct libmemcached_io_vector_st vector[]=
{
struct 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)
};
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);
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);
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;
}
++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;
if (callbacks == NULL)
{
return MEMCACHED_MEMORY_ALLOCATION_FAILURE;