Changeset 1201 for trunk/mod_coverager/xc_coverager.c

Timestamp:

2012-12-17T14:22:49+01:00 (6 months ago)

Author:

moo

Message:

fix some 64bit warnings

File:

• trunk/mod_coverager/xc_coverager.c (modified) (9 diffs)

trunk/mod_coverager/xc_coverager.c

@@ -40 +40 @@
 }
 /* }}} */
-static void xcache_mkdirs_ex(char *root, int rootlen, char *path, int pathlen TSRMLS_DC) /* {{{ */
+static void xcache_mkdirs_ex(char *root, long rootlen, char *path, long pathlen TSRMLS_DC) /* {{{ */
 {
     char *fullpath;
@@ -76 +76 @@
     long covlines, *phits;
     int fd = -1;
-    int size;
+    size_t size;
     int newfile;
     struct stat srcstat, outstat;
@@ -277 +277 @@
     zstr s;
     char *outfilename;
-    int dumpdir_len, outfilelen, alloc_len = 0;
+    size_t dumpdir_len, outfilelen, alloc_len = 0;
     uint size;
     HashPosition pos;
@@ -334 +334 @@
                 zend_hash_move_forward_ex(cov, &pos2);
             }
-            add_assoc_zval_ex(return_value, ZSTR_S(filename), strlen(ZSTR_S(filename)) + 1, lines);
+            add_assoc_zval_ex(return_value, ZSTR_S(filename), (uint) strlen(ZSTR_S(filename)) + 1, lines);
 
             zend_hash_move_forward_ex(XG(coverages), &pos);
@@ -357 +357 @@
 static coverager_t xc_coverager_get(const char *filename TSRMLS_DC) /* {{{ */
 {
-    int len = strlen(filename) + 1;
+    uint len = (uint) strlen(filename) + 1;
     coverager_t cov, *pcov;
 
@@ -473 +473 @@
     if (XG(coverages) && XG(coverager_started)) {
         int size = xc_coverager_get_op_array_size_no_tail(op_array);
-        int oplineno = (*EG(opline_ptr)) - op_array->opcodes;
+        int oplineno = (int) ((*EG(opline_ptr)) - op_array->opcodes);
         if (oplineno < size) {
             xc_coverager_add_hits(xc_coverager_get(op_array->filename TSRMLS_CC), (*EG(opline_ptr))->lineno, 1 TSRMLS_CC);
@@ -498 +498 @@
 
     p = (long*) str;
-    len -= sizeof(long);
+    len -= (int) sizeof(long);
     if (len < 0) {
         return;
@@ -507 +507 @@
     }
 
-    for (; len >= (int) sizeof(long) * 2; len -= sizeof(long) * 2, p += 2) {
+    for (; len >= (int) sizeof(long) * 2; len -= (int) sizeof(long) * 2, p += 2) {
         add_index_long(return_value, p[0], p[1] < 0 ? 0 : p[1]);
     }
@@ -658 +658 @@
 
     if (cfg_get_string("xcache.coveragedump_directory", &xc_coveragedump_dir) == SUCCESS && xc_coveragedump_dir) {
-        int len;
+        size_t len;
         xc_coveragedump_dir = pestrdup(xc_coveragedump_dir, 1);
         len = strlen(xc_coveragedump_dir);