@@ -190,9 +190,9 @@ static inline php_memc_object_t *php_memc_fetch_object(zend_object *obj) {
190
190
#define Z_MEMC_OBJ_P (zv ) php_memc_fetch_object(Z_OBJ_P(zv));
191
191
192
192
#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;
196
196
197
197
#define MEMC_METHOD_FETCH_OBJECT \
198
198
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
1341
1341
static
1342
1342
void s_key_to_keys (php_memc_keys_t * keys_out , zend_string * key )
1343
1343
{
1344
- zval zv_keys ;
1344
+ zval zv_keys ;
1345
1345
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 ));
1348
1348
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 );
1351
1351
}
1352
1352
1353
1353
static
@@ -1385,7 +1385,7 @@ zend_bool s_get_apply_fn(php_memc_object_t *intern, zend_string *key, zval *valu
1385
1385
add_assoc_zval (context -> return_value , "value" , value );
1386
1386
add_assoc_zval (context -> return_value , "cas" , cas );
1387
1387
add_assoc_long (context -> return_value , "flags" , (zend_long ) MEMC_VAL_GET_USER_FLAGS (flags ));
1388
- }
1388
+ }
1389
1389
else {
1390
1390
ZVAL_COPY (context -> return_value , value );
1391
1391
}
@@ -1650,7 +1650,7 @@ static void php_memc_getDelayed_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_
1650
1650
MEMC_METHOD_FETCH_OBJECT ;
1651
1651
s_memc_set_status (intern , MEMCACHED_SUCCESS , 0 );
1652
1652
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 );
1654
1654
1655
1655
if (fci .size > 0 ) {
1656
1656
php_memc_result_callback_ctx_t context = {
@@ -1758,15 +1758,15 @@ PHP_METHOD(Memcached, setByKey)
1758
1758
Sets a new expiration for the given key */
1759
1759
PHP_METHOD (Memcached , touch )
1760
1760
{
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 );
1762
1762
}
1763
1763
/* }}} */
1764
1764
1765
1765
/* {{{ Memcached::touchbyKey(string key, [, int expiration ])
1766
1766
Sets a new expiration for the given key */
1767
1767
PHP_METHOD (Memcached , touchByKey )
1768
1768
{
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 );
1770
1770
}
1771
1771
/* }}} */
1772
1772
#endif
@@ -2466,33 +2466,33 @@ PHP_METHOD(Memcached, getServerByKey)
2466
2466
Reset the server list in use */
2467
2467
PHP_METHOD (Memcached , resetServerList )
2468
2468
{
2469
- MEMC_METHOD_INIT_VARS ;
2469
+ MEMC_METHOD_INIT_VARS ;
2470
2470
2471
2471
if (zend_parse_parameters_none () == FAILURE ) {
2472
2472
return ;
2473
2473
}
2474
2474
2475
- MEMC_METHOD_FETCH_OBJECT ;
2475
+ MEMC_METHOD_FETCH_OBJECT ;
2476
2476
2477
- memcached_servers_reset (intern -> memc );
2478
- RETURN_TRUE ;
2477
+ memcached_servers_reset (intern -> memc );
2478
+ RETURN_TRUE ;
2479
2479
}
2480
2480
/* }}} */
2481
2481
2482
2482
/* {{{ Memcached::quit()
2483
2483
Close any open connections */
2484
2484
PHP_METHOD (Memcached , quit )
2485
2485
{
2486
- MEMC_METHOD_INIT_VARS ;
2486
+ MEMC_METHOD_INIT_VARS ;
2487
2487
2488
2488
if (zend_parse_parameters_none () == FAILURE ) {
2489
2489
return ;
2490
2490
}
2491
2491
2492
- MEMC_METHOD_FETCH_OBJECT ;
2492
+ MEMC_METHOD_FETCH_OBJECT ;
2493
2493
2494
- memcached_quit (intern -> memc );
2495
- RETURN_TRUE ;
2494
+ memcached_quit (intern -> memc );
2495
+ RETURN_TRUE ;
2496
2496
}
2497
2497
/* }}} */
2498
2498
@@ -2506,7 +2506,7 @@ PHP_METHOD(Memcached, flushBuffers)
2506
2506
return ;
2507
2507
}
2508
2508
2509
- MEMC_METHOD_FETCH_OBJECT ;
2509
+ MEMC_METHOD_FETCH_OBJECT ;
2510
2510
RETURN_BOOL (memcached_flush_buffers (intern -> memc ) == MEMCACHED_SUCCESS );
2511
2511
}
2512
2512
/* }}} */
@@ -3494,7 +3494,7 @@ zend_bool s_unserialize_value (memcached_st *memc, int val_type, zend_string *pa
3494
3494
#endif
3495
3495
break ;
3496
3496
3497
- case MEMC_VAL_IS_MSGPACK :
3497
+ case MEMC_VAL_IS_MSGPACK :
3498
3498
#ifdef HAVE_MEMCACHED_MSGPACK
3499
3499
php_msgpack_unserialize (return_value , ZSTR_VAL (payload ), ZSTR_LEN (payload ));
3500
3500
#else
@@ -4050,7 +4050,7 @@ static zend_function_entry memcached_class_methods[] = {
4050
4050
MEMC_ME (setOptions , arginfo_setOptions )
4051
4051
MEMC_ME (setBucket , arginfo_setBucket )
4052
4052
#ifdef HAVE_MEMCACHED_SASL
4053
- MEMC_ME (setSaslAuthData , arginfo_setSaslAuthData )
4053
+ MEMC_ME (setSaslAuthData , arginfo_setSaslAuthData )
4054
4054
#endif
4055
4055
MEMC_ME (isPersistent , arginfo_isPersistent )
4056
4056
MEMC_ME (isPristine , arginfo_isPristine )
@@ -4191,9 +4191,9 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
4191
4191
REGISTER_MEMC_CLASS_CONST_LONG (HAVE_JSON , 0 );
4192
4192
#endif
4193
4193
4194
- /*
4195
- * Indicate whether msgpack serializer is available
4196
- */
4194
+ /*
4195
+ * Indicate whether msgpack serializer is available
4196
+ */
4197
4197
#ifdef HAVE_MEMCACHED_MSGPACK
4198
4198
REGISTER_MEMC_CLASS_CONST_LONG (HAVE_MSGPACK , 1 );
4199
4199
#else
@@ -4330,7 +4330,7 @@ static void php_memc_register_constants(INIT_FUNC_ARGS)
4330
4330
REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_IGBINARY , SERIALIZER_IGBINARY );
4331
4331
REGISTER_MEMC_CLASS_CONST_LONG (SERIALIZER_JSON , SERIALIZER_JSON );
4332
4332
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 );
4334
4334
4335
4335
/*
4336
4336
* Compression types
0 commit comments