X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fstorage.cc;h=88d87fe36ec1aaaa0abe6f6235e39234deb2a015;hb=19d7df5119c3f07370f58857f4d916cd5de398ea;hp=40c8d34d389560b3d66793866a82e1c616142675;hpb=983523c4536f12781533124cb8a00a4291b8cf79;p=m6w6%2Flibmemcached diff --git a/libmemcached/storage.cc b/libmemcached/storage.cc index 40c8d34d..88d87fe3 100644 --- a/libmemcached/storage.cc +++ b/libmemcached/storage.cc @@ -155,7 +155,8 @@ static memcached_return_t memcached_send_binary(memcached_st *ptr, protocol_binary_request_set request= {}; size_t send_length= sizeof(request.bytes); - request.message.header.request.magic= PROTOCOL_BINARY_REQ; + initialize_binary_request(server, request.message.header); + request.message.header.request.opcode= get_com_code(verb, reply); request.message.header.request.keylen= htons((uint16_t)(key_length + memcached_array_size(ptr->_namespace))); request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES; @@ -298,10 +299,10 @@ static memcached_return_t memcached_send_ascii(memcached_st *ptr, { storage_op_string(verb), strlen(storage_op_string(verb))}, { memcached_array_string(ptr->_namespace), memcached_array_size(ptr->_namespace) }, { key, key_length }, - { flags_buffer, flags_buffer_length }, - { expiration_buffer, expiration_buffer_length }, - { value_buffer, value_buffer_length }, - { cas_buffer, cas_buffer_length }, + { flags_buffer, size_t(flags_buffer_length) }, + { expiration_buffer, size_t(expiration_buffer_length) }, + { value_buffer, size_t(value_buffer_length) }, + { cas_buffer, size_t(cas_buffer_length) }, { " noreply", reply ? 0 : memcached_literal_param_size(" noreply") }, { memcached_literal_param("\r\n") }, { value, value_length },