Browse Source

kill compiler warnings

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@90 c26eb9a1-5813-0410-bd6c-c2e55f420ca7
1.1
Xuefer 16 years ago
parent
commit
61b7b1df15
  1. 3
      coverager.c
  2. 9
      processor/head.m4
  3. 2
      processor/main.m4
  4. 2
      xcache.c

3
coverager.c

@ -205,7 +205,8 @@ void xc_coverager_request_shutdown(TSRMLS_D) /* {{{ */
coverager_t *pcov;
zstr s;
char *outfilename;
int dumpdir_len, outfilelen, size, alloc_len = 0;
int dumpdir_len, outfilelen, alloc_len = 0;
uint size;
if (!XG(coverages)) {
return;

9
processor/head.m4

@ -129,8 +129,8 @@ static inline char *xc_store_string_n(processor_t *processor, zend_uchar type, c
/* {{{ xc_get_class_num
* return class_index + 1
*/
static zend_uint xc_get_class_num(processor_t *processor, zend_class_entry *ce) {
zend_uint i;
static zend_ulong xc_get_class_num(processor_t *processor, zend_class_entry *ce) {
zend_ulong i;
const xc_entry_t *xce = processor->xce_src;
zend_class_entry *ceptr;
@ -146,12 +146,12 @@ static zend_uint xc_get_class_num(processor_t *processor, zend_class_entry *ce)
}
}
assert(0);
return (zend_uint) -1;
return (zend_ulong) -1;
}
/* }}} */
/* {{{ xc_get_class */
#ifdef ZEND_ENGINE_2
static zend_class_entry *xc_get_class(processor_t *processor, zend_uint class_num) {
static zend_class_entry *xc_get_class(processor_t *processor, zend_ulong class_num) {
/* must be parent or currrent class */
assert(class_num <= processor->active_class_num);
return CestToCePtr(processor->xce_dst->data.php->classinfos[class_num - 1].cest);
@ -254,7 +254,6 @@ xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) {
if (processor.p == NULL) {
dst = NULL;
goto err_alloc;
return NULL;
}
IFASSERT(`oldp = processor.p;')
assert(processor.p == (char *) ALIGN(processor.p));

2
processor/main.m4

@ -91,7 +91,7 @@ dnl PROC_CLASS_ENTRY_P_EX(1:dst, 2:src, 3:elm-name)
define(`PROC_CLASS_ENTRY_P_EX', `
if ($2) {
IFSTORE(`$1 = (zend_class_entry *) xc_get_class_num(processor, $2);')
IFRESTORE(`$1 = xc_get_class(processor, (zend_uint) $2);')
IFRESTORE(`$1 = xc_get_class(processor, (zend_ulong) $2);')
IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), $2->name, strlen($2->name), 1);')
}
else {

2
xcache.c

@ -1959,7 +1959,7 @@ static int xc_config_hash(xc_hash_t *p, char *name, char *default_value) /* {{{
return SUCCESS;
}
/* }}} */
static int xc_config_long(long *p, char *name, char *default_value) /* {{{ */
static int xc_config_long(zend_ulong *p, char *name, char *default_value) /* {{{ */
{
char *value;

Loading…
Cancel
Save