Skip to content

Commit 7f52206

Browse files
author
Nicolas Van Eenaeme
committed
Was a bit too greedy with all the errors
1 parent 2cc0e32 commit 7f52206

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

php_memcached.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ typedef unsigned long int uint32_t;
133133
User-defined flags
134134
****************************************/
135135
#define MEMC_UDF_MASK 0xf0
136-
#define MEMC_UDF_GET(flags) ((long)(((flags) & MEMC_UDF_MASK)>>8))
136+
#define MEMC_UDF_GET(flags) ((long)(flags & MEMC_UDF_MASK)>>8)
137137
#define MEMC_UDF_SET(flags, udf_flags) ((flags) |= ((udf_flags<<8) & MEMC_VAL_TYPE_MASK))
138138

139139
/****************************************
@@ -624,7 +624,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
624624
zval_dtor(cas_token);
625625
ZVAL_DOUBLE(cas_token, (double)cas);
626626

627-
if (udf_flags) (
627+
if (udf_flags) {
628628
ZVAL_DOUBLE(udf_flags, MEMC_UDF_GET(flags));
629629
}
630630

@@ -675,7 +675,7 @@ static void php_memc_get_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
675675
}
676676
}
677677

678-
if (udf_flags) (
678+
if (udf_flags) {
679679
ZVAL_DOUBLE(udf_flags, MEMC_UDF_GET(flags));
680680
}
681681
}
@@ -1072,7 +1072,7 @@ PHP_METHOD(Memcached, fetch)
10721072
/* XXX: also check against ULLONG_MAX or memc_behavior */
10731073
add_assoc_double_ex(return_value, ZEND_STRS("cas"), (double)cas);
10741074
}
1075-
if (flags & MEMC_UDF_MASK != 0) {
1075+
if ((flags & MEMC_UDF_MASK) != 0) {
10761076
add_assoc_long_ex(return_value, ZEND_STRS("flags"), MEMC_UDF_GET(flags));
10771077
}
10781078

@@ -1131,7 +1131,7 @@ PHP_METHOD(Memcached, fetchAll)
11311131
/* XXX: also check against ULLONG_MAX or memc_behavior */
11321132
add_assoc_double_ex(entry, ZEND_STRS("cas"), (double)cas);
11331133
}
1134-
if (flags & MEMC_UDF_MASK != 0) {
1134+
if ((flags & MEMC_UDF_MASK) != 0) {
11351135
add_assoc_long_ex(entry, ZEND_STRS("flags"), MEMC_UDF_GET(flags));
11361136
}
11371137
add_next_index_zval(return_value, entry);
@@ -3386,7 +3386,7 @@ static int php_memc_do_result_callback(zval *zmemc_obj, zend_fcall_info *fci,
33863386
if (cas != 0) {
33873387
add_assoc_double_ex(z_result, ZEND_STRS("cas"), (double)cas);
33883388
}
3389-
if (flags & MEMC_UDF_MASK != 0) {
3389+
if ((flags & MEMC_UDF_MASK) != 0) {
33903390
add_assoc_long_ex(z_result, ZEND_STRS("flags"), MEMC_UDF_GET(flags));
33913391
}
33923392

0 commit comments

Comments
 (0)