Changeset 983 in svn


Ignore:
Timestamp:
2012-07-17T08:54:15Z (3 years ago)
Author:
Xuefer
Message:

kill warnings

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/main/xc_shm_mmap.c

    r982 r983  
    246246            shm->diff = PTR_SUB(shm->ptr_ro, (char *) shm->ptr);
    247247            /* no overlap */
    248             assert(abs(shm->diff) >= size);
     248            assert((xc_shmsize_t) abs(shm->diff) >= size);
    249249        }
    250250        else {
  • trunk/main/xc_utils.c

    r982 r983  
    137137int xc_undo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
    138138{
    139     zend_op *opline, *end;
     139    zend_op *opline, *opline_end;
    140140
    141141#ifdef ZEND_ENGINE_2_4
     
    150150
    151151    opline = op_array->opcodes;
    152     end = opline + op_array->last;
    153     while (opline < end) {
     152    opline_end = opline + op_array->last;
     153    while (opline < opline_end) {
    154154#ifdef ZEND_ENGINE_2_4
    155155        if (opline->op1_type == IS_CONST) {
     
    198198int xc_redo_pass_two(zend_op_array *op_array TSRMLS_DC) /* {{{ */
    199199{
    200     zend_op *opline, *end;
     200    zend_op *opline, *opline_end;
    201201#ifdef ZEND_ENGINE_2_4
    202202    zend_literal *literal = op_array->literals;
     
    219219#ifdef ZEND_ENGINE_2_4
    220220    if (literal) {
    221         zend_literal *end = literal + op_array->last_literal;
    222         while (literal < end) {
     221        zend_literal *literal_end = literal + op_array->last_literal;
     222        while (literal < literal_end) {
    223223            Z_SET_ISREF(literal->constant);
    224224            Z_SET_REFCOUNT(literal->constant, 2); /* Make sure is_ref won't be reset */
     
    229229
    230230    opline = op_array->opcodes;
    231     end = opline + op_array->last;
    232     while (opline < end) {
     231    opline_end = opline + op_array->last;
     232    while (opline < opline_end) {
    233233#ifdef ZEND_ENGINE_2_4
    234234        if (opline->op1_type == IS_CONST) {
     
    349349int 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) /* {{{ */
    350350{
    351     zend_op *opline, *begin, *end, *next = NULL;
     351    zend_op *opline, *begin, *opline_end, *next = NULL;
    352352
    353353    opline = begin = op_array->opcodes;
    354     end = opline + op_array->last;
    355     while (opline < end) {
     354    opline_end = opline + op_array->last;
     355    while (opline < opline_end) {
    356356        switch (opline->opcode) {
    357357#ifdef ZEND_GOTO
     
    377377
    378378            case ZEND_RETURN:
    379                 opline = end;
     379                opline = opline_end;
    380380                break;
    381381
  • trunk/processor/head.m4

    r982 r983  
    368368        for (b = done_names->pListHead; b != NULL; b = b->pListNext) {
    369369            int known = 0;
    370             int i;
    371370            for (i = 0; i < assert_names_count; ++i) {
    372371                if (strcmp(assert_names[i], BUCKET_KEY_S(b)) == 0) {
  • trunk/xcache.c

    r982 r983  
    583583{
    584584    zval *blocks, *hits;
    585     int i;
     585    size_t i;
    586586    const xc_block_t *b;
    587587#ifndef NDEBUG
     
    848848                    entry_php = (xc_entry_php_t *) xc_stack_pop(s);
    849849                    TRACE("unhold %d:%s", entry_php->file_inode, entry_php->entry.name.str.val);
     850                    assert(entry_php->refcount > 0);
    850851                    --entry_php->refcount;
    851                     assert(entry_php->refcount >= 0);
    852852                }
    853853            } LEAVE_LOCK(cache);
     
    11911191        compiler->entry_hash.entryslotid = xc_hash_fold(
    11921192                compiler->new_entry.file_inode
    1193                 ? HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
     1193                ? (xc_hash_value_t) HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
    11941194                : basename_hash_value
    11951195                , &xc_php_hentry);
     
    14171417{
    14181418#ifdef ZEND_ENGINE_2_4
    1419     zend_uint linteralindex;
    1420 
    1421     for (linteralindex = 0; linteralindex < op_array_info->literalinfo_cnt; ++linteralindex) {
    1422         int index = op_array_info->literalinfos[linteralindex].index;
    1423         int literalinfo = op_array_info->literalinfos[linteralindex].info;
    1424         zend_literal *literal = &op_array->literals[index];
     1419    zend_uint literalinfoindex;
     1420
     1421    for (literalinfoindex = 0; literalinfoindex < op_array_info->literalinfo_cnt; ++literalinfoindex) {
     1422        int literalindex = op_array_info->literalinfos[literalinfoindex].index;
     1423        int literalinfo = op_array_info->literalinfos[literalinfoindex].info;
     1424        zend_literal *literal = &op_array->literals[literalindex];
    14251425        if ((literalinfo & xcache_literal_is_file)) {
    14261426            if (!shallow_copy) {
     
    14661466
    14671467    for (oplinenum = 0; oplinenum < op_array_info->oplineinfo_cnt; ++oplinenum) {
    1468         int oplineno = op_array_info->oplineinfos[oplinenum].index;
     1468        int oplineindex = op_array_info->oplineinfos[oplinenum].index;
    14691469        int oplineinfo = op_array_info->oplineinfos[oplinenum].info;
    1470         zend_op *opline = &op_array->opcodes[oplineno];
     1470        zend_op *opline = &op_array->opcodes[oplineindex];
    14711471        if ((oplineinfo & xcache_op1_is_file)) {
    14721472            assert(Z_OP_TYPE(opline->op1) == IS_CONST);
     
    34123412    PHP_FE(xcache_dprint,            NULL)
    34133413#endif
     3414#ifdef PHP_FE_END
     3415    PHP_FE_END
     3416#else
    34143417    {NULL, NULL,                     NULL}
     3418#endif
    34153419};
    34163420/* }}} */
     
    40284032    ZEND_MOD_CONFLICTS("eAccelerator")
    40294033    ZEND_MOD_CONFLICTS("Turck MMCache")
    4030     {NULL, NULL, NULL}
     4034#ifdef ZEND_MOD_END
     4035    ZEND_MOD_END
     4036#else
     4037    {NULL, NULL, NULL, 0}
     4038#endif
    40314039};
    40324040#endif
Note: See TracChangeset for help on using the changeset viewer.