@@ -1965,7 +1965,7 @@ PHP_METHOD(Memcached, getServerByKey)
1965
1965
{
1966
1966
char * server_key ;
1967
1967
int server_key_len ;
1968
- memcached_server_st * server ;
1968
+ memcached_server_instance_st * server_instance ;
1969
1969
memcached_return error ;
1970
1970
MEMC_METHOD_INIT_VARS ;
1971
1971
@@ -1981,16 +1981,16 @@ PHP_METHOD(Memcached, getServerByKey)
1981
1981
RETURN_FALSE ;
1982
1982
}
1983
1983
1984
- server = memcached_server_by_key (m_obj -> memc , server_key , server_key_len , & error );
1985
- if (server == NULL ) {
1984
+ server_instance = memcached_server_by_key (m_obj -> memc , server_key , server_key_len , & error );
1985
+ if (server_instance == NULL ) {
1986
1986
php_memc_handle_error (i_obj , error TSRMLS_CC );
1987
1987
RETURN_FALSE ;
1988
1988
}
1989
1989
1990
1990
array_init (return_value );
1991
- add_assoc_string (return_value , "host" , server -> hostname , 1 );
1992
- add_assoc_long (return_value , "port" , server -> port );
1993
- add_assoc_long (return_value , "weight" , server -> weight );
1991
+ add_assoc_string (return_value , "host" , ( char * ) memcached_server_name ( server_instance ) , 1 );
1992
+ add_assoc_long (return_value , "port" , memcached_server_port ( server_instance ) );
1993
+ add_assoc_long (return_value , "weight" , 0 );
1994
1994
}
1995
1995
/* }}} */
1996
1996
@@ -2587,7 +2587,7 @@ static memcached_return php_memc_do_serverlist_callback(const memcached_st *ptr,
2587
2587
2588
2588
MAKE_STD_ZVAL (array );
2589
2589
array_init (array );
2590
- add_assoc_string (array , "host" , memcached_server_name (instance ), 1 );
2590
+ add_assoc_string (array , "host" , ( char * ) memcached_server_name (instance ), 1 );
2591
2591
add_assoc_long (array , "port" , memcached_server_port (instance ));
2592
2592
/*
2593
2593
* API does not allow to get at this field.
0 commit comments