Changeset 1201 for trunk/mod_cacher/xc_cacher.c

Timestamp:

12/17/2012 02:22:49 PM (5 months ago)

Author:

moo

Message:

fix some 64bit warnings

Files:

• trunk/mod_cacher/xc_cacher.c (modified) (11 diffs)

trunk/mod_cacher/xc_cacher.c

@@ -411 +411 @@
     time_t n = XG(request_time) / interval;
     if (*curtime != n) {
-        zend_uint target_slot = n % count;
+        zend_uint target_slot = ((zend_uint) n) % count;
         zend_uint slot;
         for (slot = advance_wrapped(*curslot, count);
@@ -449 +449 @@
 {
     xc_entry_t *p, **pp;
-    int i, c;
+    size_t i, c;
 
     for (i = 0, c = cache->hentry->size; i < c; i ++) {
@@ -517 +517 @@
 static void xc_gc_expires_var(TSRMLS_D) /* {{{ */
 {
-    int i, c;
+    size_t i, c;
 
     if (!xc_var_gc_interval || !xc_var_caches) {
@@ -736 +736 @@
 {
     zval* list;
-    int i, c;
+    size_t i, c;
     xc_entry_t *e;
 
@@ -934 +934 @@
     char *tokbuf;
     size_t path_buffer_len;
-    int size;
+    size_t size;
     char tokens[] = { DEFAULT_DIR_SEPARATOR, '\0' };
     int ret;
@@ -969 +969 @@
     if (zend_is_executing(TSRMLS_C)) {
         const char *executing_filename = zend_get_executed_filename(TSRMLS_C);
-        int dirname_len = strlen(executing_filename);
+        int dirname_len = (int) strlen(executing_filename);
         size_t filename_len = strlen(filepath);
 
@@ -1066 +1066 @@
 
     compiler->new_entry.entry.name.str.val = xc_expand_url(filepath, compiler->opened_path_buffer TSRMLS_CC);
-    compiler->new_entry.entry.name.str.len = strlen(compiler->new_entry.entry.name.str.val);
+    compiler->new_entry.entry.name.str.len = (int) strlen(compiler->new_entry.entry.name.str.val);
 
     *entry_checker_data->stored_entry = (xc_entry_php_t *) xc_entry_find_unlocked(
@@ -1144 +1144 @@
     else {
 #ifdef ZEND_ENGINE_2_3
-        char *opened_path = php_resolve_path(compiler->filename, compiler->filename_len, PG(include_path) TSRMLS_CC);
+        char *opened_path = php_resolve_path(compiler->filename, (int) compiler->filename_len, PG(include_path) TSRMLS_CC);
         if (opened_path) {
             strcpy(compiler->opened_path_buffer, opened_path);
@@ -1182 +1182 @@
 
         delta = XG(request_time) - buf.st_mtime;
-        if (abs(delta) < 2 && !xc_test) {
+        if (abs((int) delta) < 2 && !xc_test) {
             return FAILURE;
         }
@@ -1214 +1214 @@
             ++basename_begin;
 
-            basename_hash_value = HASH_STR_L(basename_begin, filename_end - basename_begin);
+            basename_hash_value = HASH_STR_L(basename_begin, (uint) (filename_end - basename_begin));
         }
 
@@ -1254 +1254 @@
 
     PHP_MD5Init(&context);
-    while ((n = php_stream_read(stream, (char *) buf, sizeof(buf))) > 0) {
+    while ((n = php_stream_read(stream, (char *) buf, (int) sizeof(buf))) > 0) {
         PHP_MD5Update(&context, buf, n);
     }