projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
bcceaba
)
Fix style issue
author
Brian Aker
<brian@tangent.org>
Mon, 24 Dec 2012 10:46:51 +0000
(
05:46
-0500)
committer
Brian Aker
<brian@tangent.org>
Mon, 24 Dec 2012 10:46:51 +0000
(
05:46
-0500)
libmemcached/instance.cc
patch
|
blob
|
history
diff --git
a/libmemcached/instance.cc
b/libmemcached/instance.cc
index dea8dd62d10f512477391400f5f56b58f816a763..1414d7251c453ac127073001b7957f864b2cbcf6 100644
(file)
--- a/
libmemcached/instance.cc
+++ b/
libmemcached/instance.cc
@@
-176,25
+176,25
@@
void memcached_instance_free(org::libmemcached::Instance* self)
}
}
}
}
-memcached_return_t memcached_server_cursor(const memcached_st
*ptr
,
+memcached_return_t memcached_server_cursor(const memcached_st
* memc
,
const memcached_server_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
memcached_return_t rc;
const memcached_server_fn *callback,
void *context,
uint32_t number_of_callbacks)
{
memcached_return_t rc;
- if (memcached_failed(rc= initialize_const_query(
ptr
)))
+ if (memcached_failed(rc= initialize_const_query(
memc
)))
{
return rc;
}
size_t errors= 0;
{
return rc;
}
size_t errors= 0;
- for (uint32_t x= 0; x < memcached_instance_list_count(
ptr
); x++)
+ for (uint32_t x= 0; x < memcached_instance_list_count(
memc
); x++)
{
{
- org::libmemcached::Instance* instance= memcached_instance_by_position(
ptr
, x);
+ org::libmemcached::Instance* instance= memcached_instance_by_position(
memc
, x);
for (uint32_t y= 0; y < number_of_callbacks; y++)
{
for (uint32_t y= 0; y < number_of_callbacks; y++)
{
- memcached_return_t ret= (*callback[y])(
ptr
, instance, context);
+ memcached_return_t ret= (*callback[y])(
memc
, instance, context);
if (memcached_failed(ret))
{
if (memcached_failed(ret))
{
@@
-207,7
+207,7
@@
memcached_return_t memcached_server_cursor(const memcached_st *ptr,
return errors ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
}
return errors ? MEMCACHED_SOME_ERRORS : MEMCACHED_SUCCESS;
}
-memcached_return_t memcached_server_execute(memcached_st *
ptr
,
+memcached_return_t memcached_server_execute(memcached_st *
memc
,
memcached_server_execute_fn callback,
void *context)
{
memcached_server_execute_fn callback,
void *context)
{
@@
-217,11
+217,11
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
}
bool some_errors= false;;
}
bool some_errors= false;;
- for (uint32_t x= 0; x < memcached_instance_list_count(
ptr
); x++)
+ for (uint32_t x= 0; x < memcached_instance_list_count(
memc
); x++)
{
{
- org::libmemcached::Instance* instance= memcached_instance_fetch(
ptr
, x);
+ org::libmemcached::Instance* instance= memcached_instance_fetch(
memc
, x);
- memcached_return_t rc= (*callback)(
ptr
, instance, context);
+ memcached_return_t rc= (*callback)(
memc
, instance, context);
if (rc == MEMCACHED_INVALID_ARGUMENTS)
{
return rc;
if (rc == MEMCACHED_INVALID_ARGUMENTS)
{
return rc;
@@
-236,7
+236,7
@@
memcached_return_t memcached_server_execute(memcached_st *ptr,
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
-memcached_server_instance_st memcached_server_by_key(memcached_st *
ptr
,
+memcached_server_instance_st memcached_server_by_key(memcached_st *
memc
,
const char *key,
size_t key_length,
memcached_return_t *error)
const char *key,
size_t key_length,
memcached_return_t *error)
@@
-249,20
+249,20
@@
memcached_server_instance_st memcached_server_by_key(memcached_st *ptr,
memcached_return_t rc;
memcached_return_t rc;
- if (memcached_failed(rc= initialize_const_query(
ptr
)))
+ if (memcached_failed(rc= initialize_const_query(
memc
)))
{
*error= rc;
return NULL;
}
{
*error= rc;
return NULL;
}
- if (memcached_failed((memcached_key_test(*
ptr
, (const char **)&key, &key_length, 1))))
+ if (memcached_failed((memcached_key_test(*
memc
, (const char **)&key, &key_length, 1))))
{
{
- *error= memcached_last_error(
ptr
);
+ *error= memcached_last_error(
memc
);
return NULL;
}
return NULL;
}
- uint32_t server_key= memcached_generate_hash(
ptr
, key, key_length);
- return memcached_instance_by_position(
ptr
, server_key);
+ uint32_t server_key= memcached_generate_hash(
memc
, key, key_length);
+ return memcached_instance_by_position(
memc
, server_key);
}
/*
}
/*