xcache
/
xcache
1
0
Fork 0
Code Releases Activity
Browse Source

kill warnings 

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@983 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
3.0
Xuefer 9 years ago
parent
ef5a13d72a
commit
94c430e1b1
4 changed files with 32 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      main/xc_shm_mmap.c
  2. 24
      main/xc_utils.c
  3. 1
      processor/head.m4
  4. 30
      xcache.c

2
main/xc_shm_mmap.c
View File

@ -245,7 +245,7 @@ static XC_SHM_INIT(xc_mmap_init) /* {{{ */
if (ro_ok) {
shm->diff = PTR_SUB(shm->ptr_ro, (char *) shm->ptr);
/* no overlap */
assert(abs(shm->diff) >= size);
assert((xc_shmsize_t) abs(shm->diff) >= size);
}
else {
if (shm->ptr_ro) {

24
main/xc_utils.c
View File

@ -136,7 +136,7 @@ int xc_apply_op_array(xc_compile_result_t *cr, apply_func_t applyer TSRMLS_DC) /
/* }}} */
int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
{
zend_op *opline, *end;
zend_op *opline, *opline_end;
#ifdef ZEND_ENGINE_2_4
if (!(op_array->fn_flags & ZEND_ACC_DONE_PASS_TWO)) {
@ -149,8 +149,8 @@ int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
#endif
opline = op_array->opcodes;
end = opline + op_array->last;
while (opline < end) {
opline_end = opline + op_array->last;
while (opline < opline_end) {
#ifdef ZEND_ENGINE_2_4
if (opline->op1_type == IS_CONST) {
opline->op1.constant = opline->op1.literal - op_array->literals;
@ -197,7 +197,7 @@ int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
/* }}} */
int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
{
zend_op *opline, *end;
zend_op *opline, *opline_end;
#ifdef ZEND_ENGINE_2_4
zend_literal *literal = op_array->literals;
#endif
@ -218,8 +218,8 @@ int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
*/
#ifdef ZEND_ENGINE_2_4
if (literal) {
zend_literal *end = literal + op_array->last_literal;
while (literal < end) {
zend_literal *literal_end = literal + op_array->last_literal;
while (literal < literal_end) {
Z_SET_ISREF(literal->constant);
Z_SET_REFCOUNT(literal->constant, 2); /* Make sure is_ref won't be reset */
literal++;
@ -228,8 +228,8 @@ int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
#endif
opline = op_array->opcodes;
end = opline + op_array->last;
while (opline < end) {
opline_end = opline + op_array->last;
while (opline < opline_end) {
#ifdef ZEND_ENGINE_2_4
if (opline->op1_type == IS_CONST) {
opline->op1.literal = op_array->literals + opline->op1.constant;
@ -348,11 +348,11 @@ int xc_undo_fix_opcode(zend_op_array *op_array TSRMLS_DC) /* {{{ */
int xc_foreach_early_binding_class(zend_op_array *op_array, void (*callback)(zend_op *opline, int oplineno, void *data TSRMLS_DC), void *data TSRMLS_DC) /* {{{ */
{
zend_op *opline, *begin, *end, *next = NULL;
zend_op *opline, *begin, *opline_end, *next = NULL;
opline = begin = op_array->opcodes;
end = opline + op_array->last;
while (opline < end) {
opline_end = opline + op_array->last;
while (opline < opline_end) {
switch (opline->opcode) {
#ifdef ZEND_GOTO
case ZEND_GOTO:
@ -376,7 +376,7 @@ int xc_foreach_early_binding_class(zend_op_array *op_array, void (*callback)(zen
break;
case ZEND_RETURN:
opline = end;
opline = opline_end;
break;
#ifdef ZEND_ENGINE_2

1
processor/head.m4
View File

@ -367,7 +367,6 @@ static int xc_check_names(const char *file, int line, const char *functionName,
for (b = done_names->pListHead; b != NULL; b = b->pListNext) {
int known = 0;
int i;
for (i = 0; i < assert_names_count; ++i) {
if (strcmp(assert_names[i], BUCKET_KEY_S(b)) == 0) {
known = 1;

30
xcache.c
View File

@ -582,7 +582,7 @@ static void xc_gc_deletes(TSRMLS_D) /* {{{ */
static void xc_fillinfo_unlocked(int cachetype, xc_cache_t *cache, zval *return_value TSRMLS_DC) /* {{{ */
{
zval *blocks, *hits;
int i;
size_t i;
const xc_block_t *b;
#ifndef NDEBUG
xc_memsize_t avail = 0;
@ -847,8 +847,8 @@ static inline void xc_entry_unholds_real(xc_stack_t *holds, xc_cache_t **caches,
while (xc_stack_count(s)) {
entry_php = (xc_entry_php_t *) xc_stack_pop(s);
TRACE("unhold %d:%s", entry_php->file_inode, entry_php->entry.name.str.val);
assert(entry_php->refcount > 0);
--entry_php->refcount;
assert(entry_php->refcount >= 0);
}
} LEAVE_LOCK(cache);
}
@ -1190,7 +1190,7 @@ static int xc_entry_php_init_key(xc_compiler_t *compiler TSRMLS_DC) /* {{{ */
compiler->entry_hash.cacheid = xc_php_hcache.size > 1 ? xc_hash_fold(basename_hash_value, &xc_php_hcache) : 0;
compiler->entry_hash.entryslotid = xc_hash_fold(
compiler->new_entry.file_inode
? HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
? (xc_hash_value_t) HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
: basename_hash_value
, &xc_php_hentry);
}
@ -1416,12 +1416,12 @@ static void xc_collect_op_array_info(xc_compiler_t *compiler, xc_const_usage_t *
void xc_fix_op_array_info(const xc_entry_php_t *entry_php, const xc_entry_data_php_t *php, zend_op_array *op_array, int shallow_copy, const xc_op_array_info_t *op_array_info TSRMLS_DC) /* {{{ */
{
#ifdef ZEND_ENGINE_2_4
zend_uint linteralindex;
zend_uint literalinfoindex;
for (linteralindex = 0; linteralindex < op_array_info->literalinfo_cnt; ++linteralindex) {
int index = op_array_info->literalinfos[linteralindex].index;
int literalinfo = op_array_info->literalinfos[linteralindex].info;
zend_literal *literal = &op_array->literals[index];
for (literalinfoindex = 0; literalinfoindex < op_array_info->literalinfo_cnt; ++literalinfoindex) {
int literalindex = op_array_info->literalinfos[literalinfoindex].index;
int literalinfo = op_array_info->literalinfos[literalinfoindex].info;
zend_literal *literal = &op_array->literals[literalindex];
if ((literalinfo & xcache_literal_is_file)) {
if (!shallow_copy) {
efree(Z_STRVAL(literal->constant));
@ -1465,9 +1465,9 @@ void xc_fix_op_array_info(const xc_entry_php_t *entry_php, const xc_entry_data_p
zend_uint oplinenum;
for (oplinenum = 0; oplinenum < op_array_info->oplineinfo_cnt; ++oplinenum) {
int oplineno = op_array_info->oplineinfos[oplinenum].index;
int oplineindex = op_array_info->oplineinfos[oplinenum].index;
int oplineinfo = op_array_info->oplineinfos[oplinenum].info;
zend_op *opline = &op_array->opcodes[oplineno];
zend_op *opline = &op_array->opcodes[oplineindex];
if ((oplineinfo & xcache_op1_is_file)) {
assert(Z_OP_TYPE(opline->op1) == IS_CONST);
if (!shallow_copy) {
@ -3411,7 +3411,11 @@ static zend_function_entry xcache_functions[] = /* {{{ */
#ifdef HAVE_XCACHE_DPRINT
PHP_FE(xcache_dprint, NULL)
#endif
#ifdef PHP_FE_END
PHP_FE_END
#else
{NULL, NULL, NULL}
#endif
};
/* }}} */
@ -4027,7 +4031,11 @@ static zend_module_dep xcache_module_deps[] = {
ZEND_MOD_CONFLICTS("apc")
ZEND_MOD_CONFLICTS("eAccelerator")
ZEND_MOD_CONFLICTS("Turck MMCache")
{NULL, NULL, NULL}
#ifdef ZEND_MOD_END
ZEND_MOD_END
#else
{NULL, NULL, NULL, 0}
#endif
};
#endif
/* }}} */

Write Preview
Loading…
Cancel
Save