Fixed return type of hash strategy free_state

This commit is contained in:
Mikael Johansson
2007-05-01 14:15:20 +00:00
parent 82117c23a6
commit aa1260dfd3
4 changed files with 4 additions and 6 deletions

View File

@@ -52,7 +52,7 @@ void *mmc_consistent_create_state() /* {{{ */
}
/* }}} */
void *mmc_consistent_free_state(void *s) /* {{{ */
void mmc_consistent_free_state(void *s) /* {{{ */
{
mmc_consistent_state_t *state = s;
if (state != NULL) {

View File

@@ -43,7 +43,7 @@ void *mmc_standard_create_state() /* {{{ */
}
/* }}} */
void *mmc_standard_free_state(void *s) /* {{{ */
void mmc_standard_free_state(void *s) /* {{{ */
{
mmc_standard_state_t *state = s;
if (state != NULL) {

View File

@@ -99,7 +99,7 @@ typedef struct mmc {
/* hashing strategy */
typedef void * (*mmc_hash_create_state)();
typedef void * (*mmc_hash_free_state)(void *);
typedef void (*mmc_hash_free_state)(void *);
typedef mmc_t * (*mmc_hash_find_server)(void *, const char *, int TSRMLS_DC);
typedef void (*mmc_hash_add_server)(void *, mmc_t *, unsigned int);

View File

@@ -13,13 +13,11 @@ var_dump(ini_get('memcache.hash_strategy'));
ini_set('memcache.hash_strategy', 'consistent');
var_dump(ini_get('memcache.hash_strategy'));
ini_set('memcache.hash_strategy', 'abs');
@ini_set('memcache.hash_strategy', 'abs');
var_dump(ini_get('memcache.hash_strategy'));
?>
--EXPECTF--
string(8) "standard"
string(10) "consistent"
Warning: ini_set(): memcache.hash_strategy must be in set {standard, consistent} ('abs' given) in /home/mikl/arch/php6/src/pecl/memcache.consistent/tests/037.php on line 11
string(10) "consistent"