@@ -190,9 +190,9 @@ static inline php_memc_object_t *php_memc_fetch_object(zend_object *obj) {
190190#define Z_MEMC_OBJ_P (zv ) php_memc_fetch_object(Z_OBJ_P(zv));
191191
192192#define MEMC_METHOD_INIT_VARS \
193- zval* object = getThis(); \
194- php_memc_object_t* intern = NULL; \
195- php_memc_user_data_t* memc_user_data = NULL;
193+ zval* object = getThis(); \
194+ php_memc_object_t* intern = NULL; \
195+ php_memc_user_data_t* memc_user_data = NULL;
196196
197197#define MEMC_METHOD_FETCH_OBJECT \
198198 intern = Z_MEMC_OBJ_P(object); \
@@ -1341,13 +1341,13 @@ void s_hash_to_keys(php_memc_keys_t *keys_out, HashTable *hash_in, zend_bool pre
13411341static
13421342void s_key_to_keys (php_memc_keys_t * keys_out , zend_string * key )
13431343{
1344- zval zv_keys ;
1344+ zval zv_keys ;
13451345
1346- array_init (& zv_keys );
1347- add_next_index_str (& zv_keys , zend_string_copy (key ));
1346+ array_init (& zv_keys );
1347+ add_next_index_str (& zv_keys , zend_string_copy (key ));
13481348
1349- s_hash_to_keys (keys_out , Z_ARRVAL (zv_keys ), 0 , NULL );
1350- zval_ptr_dtor (& zv_keys );
1349+ s_hash_to_keys (keys_out , Z_ARRVAL (zv_keys ), 0 , NULL );
1350+ zval_ptr_dtor (& zv_keys );
13511351}
13521352
13531353static
@@ -1385,7 +1385,7 @@ zend_bool s_get_apply_fn(php_memc_object_t *intern, zend_string *key, zval *valu
13851385 add_assoc_zval (context -> return_value , "value" , value );
13861386 add_assoc_zval (context -> return_value , "cas" , cas );
13871387 add_assoc_long (context -> return_value , "flags" , (zend_long ) MEMC_VAL_GET_USER_FLAGS (flags ));
1388- }
1388+ }
13891389 else {
13901390 ZVAL_COPY (context -> return_value , value );
13911391 }
@@ -1650,7 +1650,7 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_
16501650 MEMC_METHOD_FETCH_OBJECT ;
16511651 s_memc_set_status (intern , MEMCACHED_SUCCESS , 0 );
16521652
1653- s_hash_to_keys (& keys_out , Z_ARRVAL_P (keys ), 0 , NULL );
1653+ s_hash_to_keys (& keys_out , Z_ARRVAL_P (keys ), 0 , NULL );
16541654
16551655 if (fci .size > 0 ) {
16561656 php_memc_result_callback_ctx_t context = {
@@ -1758,15 +1758,15 @@ PHP_METHOD(Memcached, setByKey)
17581758 Sets a new expiration for the given key */
17591759PHP_METHOD (Memcached , touch )
17601760{
1761- php_memc_store_impl (INTERNAL_FUNCTION_PARAM_PASSTHRU , MEMC_OP_TOUCH , 0 );
1761+ php_memc_store_impl (INTERNAL_FUNCTION_PARAM_PASSTHRU , MEMC_OP_TOUCH , 0 );
17621762}
17631763/* }}} */
17641764
17651765/* {{{ Memcached::touchbyKey(string key, [, int expiration ])
17661766 Sets a new expiration for the given key */
17671767PHP_METHOD (Memcached , touchByKey )
17681768{
1769- php_memc_store_impl (INTERNAL_FUNCTION_PARAM_PASSTHRU , MEMC_OP_TOUCH , 1 );
1769+ php_memc_store_impl (INTERNAL_FUNCTION_PARAM_PASSTHRU , MEMC_OP_TOUCH , 1 );
17701770}
17711771/* }}} */
17721772#endif
@@ -2466,33 +2466,33 @@ PHP_METHOD(Memcached, getServerByKey)
24662466 Reset the server list in use */
24672467PHP_METHOD (Memcached , resetServerList )
24682468{
2469- MEMC_METHOD_INIT_VARS ;
2469+ MEMC_METHOD_INIT_VARS ;
24702470
24712471 if (zend_parse_parameters_none () == FAILURE ) {
24722472 return ;
24732473 }
24742474
2475- MEMC_METHOD_FETCH_OBJECT ;
2475+ MEMC_METHOD_FETCH_OBJECT ;
24762476
2477- memcached_servers_reset (intern -> memc );
2478- RETURN_TRUE ;
2477+ memcached_servers_reset (intern -> memc );
2478+ RETURN_TRUE ;
24792479}
24802480/* }}} */
24812481
24822482/* {{{ Memcached::quit()
24832483 Close any open connections */
24842484PHP_METHOD (Memcached , quit )
24852485{
2486- MEMC_METHOD_INIT_VARS ;
2486+ MEMC_METHOD_INIT_VARS ;
24872487
24882488 if (zend_parse_parameters_none () == FAILURE ) {
24892489 return ;
24902490 }
24912491
2492- MEMC_METHOD_FETCH_OBJECT ;
2492+ MEMC_METHOD_FETCH_OBJECT ;
24932493
2494- memcached_quit (intern -> memc );
2495- RETURN_TRUE ;
2494+ memcached_quit (intern -> memc );
2495+ RETURN_TRUE ;
24962496}
24972497/* }}} */
24982498
@@ -2506,7 +2506,7 @@ PHP_METHOD(Memcached, flushBuffers)
25062506 return ;
25072507 }
25082508
2509- MEMC_METHOD_FETCH_OBJECT ;
2509+ MEMC_METHOD_FETCH_OBJECT ;
25102510 RETURN_BOOL (memcached_flush_buffers (intern -> memc ) == MEMCACHED_SUCCESS );
25112511}
25122512/* }}} */
@@ -3494,7 +3494,7 @@ zend_bool s_unserialize_value (memcached_st *memc, int val_type, zend_string *pa
34943494#endif
34953495 break ;
34963496
3497- case MEMC_VAL_IS_MSGPACK :
3497+ case MEMC_VAL_IS_MSGPACK :
34983498#ifdef HAVE_MEMCACHED_MSGPACK
34993499 php_msgpack_unserialize (return_value , ZSTR_VAL (payload ), ZSTR_LEN (payload ));
35003500#else
@@ -4050,7 +4050,7 @@ static zend_function_entry memcached_class_methods[] = {
40504050 MEMC_ME (setOptions , arginfo_setOptions )
40514051 MEMC_ME (setBucket , arginfo_setBucket )
40524052#ifdef HAVE_MEMCACHED_SASL
4053- MEMC_ME (setSaslAuthData , arginfo_setSaslAuthData )
4053+ MEMC_ME (setSaslAuthData , arginfo_setSaslAuthData )
40544054#endif
40554055 MEMC_ME (isPersistent , arginfo_isPersistent )
40564056 MEMC_ME (isPristine , arginfo_isPristine )
@@ -4191,9 +4191,9 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
41914191 REGISTER_MEMC_CLASS_CONST_LONG (HAVE_JSON , 0 );
41924192#endif
41934193
4194- /*
4195- * Indicate whether msgpack serializer is available
4196- */
4194+ /*
4195+ * Indicate whether msgpack serializer is available
4196+ */
41974197#ifdef HAVE_MEMCACHED_MSGPACK
41984198 REGISTER_MEMC_CLASS_CONST_LONG (HAVE_MSGPACK , 1 );
41994199#else
@@ -4330,7 +4330,7 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
43304330 REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_IGBINARY , SERIALIZER_IGBINARY );
43314331 REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_JSON , SERIALIZER_JSON );
43324332 REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_JSON_ARRAY , SERIALIZER_JSON_ARRAY );
4333- REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_MSGPACK , SERIALIZER_MSGPACK );
4333+ REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_MSGPACK , SERIALIZER_MSGPACK );
43344334
43354335 /*
43364336 * Compression types
0 commit comments