Use 'long' data type to find out the last dead code checker ID

xdebug · Jan 21, 2015 · 8da0141 · 8da0141
1 parent cee8ec6
commit 8da0141
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/php_xdebug.h b/php_xdebug.h
@@ -197,7 +197,7 @@ ZEND_BEGIN_MODULE_GLOBALS(xdebug)
 	zend_bool     code_coverage_dead_code_analysis;
 	unsigned int  function_count;
 	int           dead_code_analysis_tracker_offset;
-	void         *dead_code_last_start_id;
+	long          dead_code_last_start_id;
 	char                 *previous_filename;
 	xdebug_coverage_file *previous_file;
 

diff --git a/xdebug_code_coverage.c b/xdebug_code_coverage.c
@@ -549,7 +549,7 @@ static int prefill_from_function_table(zend_op_array *opa XDEBUG_ZEND_HASH_APPLY
 
 	new_filename = va_arg(args, char*);
 	if (opa->type == ZEND_USER_FUNCTION) {
-		if (opa->reserved[XG(dead_code_analysis_tracker_offset)] < XG(dead_code_last_start_id)) {
+		if ((long) opa->reserved[XG(dead_code_analysis_tracker_offset)] < XG(dead_code_last_start_id)) {
 			prefill_from_oparray((char *) opa->filename, opa TSRMLS_CC);
 		}
 	}
@@ -577,7 +577,7 @@ static int prefill_from_class_table(zend_class_entry **class_entry XDEBUG_ZEND_H
 
 void xdebug_prefill_code_coverage(zend_op_array *op_array TSRMLS_DC)
 {
-	if (op_array->reserved[XG(dead_code_analysis_tracker_offset)] < XG(dead_code_last_start_id)) {
+	if ((long) op_array->reserved[XG(dead_code_analysis_tracker_offset)] < XG(dead_code_last_start_id)) {
 		prefill_from_oparray((char *) op_array->filename, op_array TSRMLS_CC);
 	}