Changeset 90

Timestamp:

07/16/2006 06:06:46 AM (2 years ago)

Author:

moo

Message:

kill compiler warnings

Location:

trunk

Files:

• coverager.c (modified) (1 diff)
• processor/head.m4 (modified) (3 diffs)
• processor/main.m4 (modified) (1 diff)
• xcache.c (modified) (1 diff)

trunk/coverager.c

@@ -206 +206 @@
     zstr s;
     char *outfilename;
-    int dumpdir_len, outfilelen, size, alloc_len = 0;
+    int dumpdir_len, outfilelen, alloc_len = 0;
+    uint size;
 
     if (!XG(coverages)) {

trunk/processor/head.m4

@@ -130 +130 @@
  * 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;
@@ -147 +147 @@
     }
     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);
@@ -255 +255 @@
             dst = NULL;
             goto err_alloc;
-            return NULL;
         }
         IFASSERT(`oldp = processor.p;')

trunk/processor/main.m4

@@ -92 +92 @@
     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);')
     }

trunk/xcache.c

@@ -1960 +1960 @@
 }
 /* }}} */
-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;