Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd

laruence · laruence · commit f4dc2240a048 · 2013-08-14T11:42:39.000+08:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1097,7 +1097,7 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 	if(DTRACE_ERROR_ENABLED()) {
 		char *dtrace_error_buffer;
 		zend_vspprintf(&dtrace_error_buffer, 0, format, args);
-		DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);
+		DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);
 		efree(dtrace_error_buffer);
 	}
 #endif /* HAVE_DTRACE */
diff --git a/Zend/zend_dtrace.c b/Zend/zend_dtrace.c
@@ -24,7 +24,7 @@
 
 #ifdef HAVE_DTRACE
 /* PHP DTrace probes {{{ */
-static inline char *dtrace_get_executed_filename(TSRMLS_D)
+static inline const char *dtrace_get_executed_filename(TSRMLS_D)
 {
 	if (EG(current_execute_data) && EG(current_execute_data)->op_array) {
 		return EG(current_execute_data)->op_array->filename;
@@ -36,9 +36,9 @@ static inline char *dtrace_get_executed_filename(TSRMLS_D)
 ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int type TSRMLS_DC)
 {
 	zend_op_array *res;
-	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);
+	DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename);
 	res = compile_file(file_handle, type TSRMLS_CC);
-	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->filename);
+	DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename);
 
 	return res;
 }
@@ -47,7 +47,7 @@ ZEND_API zend_op_array *dtrace_compile_file(zend_file_handle *file_handle, int t
 ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
 {
 	int lineno;
-	char *scope, *filename, *funcname, *classname;
+	const char *scope, *filename, *funcname, *classname;
 	scope = filename = funcname = classname = NULL;
 
 	/* we need filename and lineno for both execute and function probes */
@@ -65,41 +65,41 @@ ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
-		DTRACE_EXECUTE_ENTRY(filename, lineno);
+		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
 	}
 
 	if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname != NULL) {
-		DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);
+		DTRACE_FUNCTION_ENTRY((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
 	}
 
 	execute(op_array TSRMLS_CC);
 
 	if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {
-		DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);
+		DTRACE_FUNCTION_RETURN((char *)funcname, (char *)filename, lineno, (char *)classname, (char *)scope);
 	}
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
-		DTRACE_EXECUTE_RETURN(filename, lineno);
+		DTRACE_EXECUTE_RETURN((char *)filename, lineno);
 	}
 }
 
 ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC)
 {
 	int lineno;
-	char *filename;
+	const char *filename;
 	if (DTRACE_EXECUTE_ENTRY_ENABLED() || DTRACE_EXECUTE_RETURN_ENABLED()) {
 		filename = dtrace_get_executed_filename(TSRMLS_C);
 		lineno = zend_get_executed_lineno(TSRMLS_C);
 	}
 
 	if (DTRACE_EXECUTE_ENTRY_ENABLED()) {
-		DTRACE_EXECUTE_ENTRY(filename, lineno);
+		DTRACE_EXECUTE_ENTRY((char *)filename, lineno);
 	}
 
 	execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);
 
 	if (DTRACE_EXECUTE_RETURN_ENABLED()) {
-		DTRACE_EXECUTE_RETURN(filename, lineno);
+		DTRACE_EXECUTE_RETURN((char *)filename, lineno);
 	}
 }
 
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2984,7 +2984,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)
 
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT(ce->name);
+		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
 	}
 #endif /* HAVE_DTRACE */
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -6279,7 +6279,7 @@ static int ZEND_FASTCALL  ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A
 
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
-		DTRACE_EXCEPTION_CAUGHT(ce->name);
+		DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
 	}
 #endif /* HAVE_DTRACE */
 
diff --git a/main/main.c b/main/main.c
@@ -1526,7 +1526,7 @@ int php_request_startup(TSRMLS_D)
 	int retval = SUCCESS;
 
 #ifdef HAVE_DTRACE
-	DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
+	DTRACE_REQUEST_STARTUP(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), (char *)SAFE_FILENAME(SG(request_info).request_method));
 #endif /* HAVE_DTRACE */
 
 #ifdef PHP_WIN32
@@ -1836,7 +1836,7 @@ void php_request_shutdown(void *dummy)
 #endif
 
 #ifdef HAVE_DTRACE
-	DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), SAFE_FILENAME(SG(request_info).request_method));
+	DTRACE_REQUEST_SHUTDOWN(SAFE_FILENAME(SG(request_info).path_translated), SAFE_FILENAME(SG(request_info).request_uri), (char *)SAFE_FILENAME(SG(request_info).request_method));
 #endif /* HAVE_DTRACE */
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ ZEND_API void zend_error(int type, const char format, ...) / {{{ */`
`1097`	`1097`	`if(DTRACE_ERROR_ENABLED()) {`
`1098`	`1098`	`char *dtrace_error_buffer;`
`1099`	`1099`	`zend_vspprintf(&dtrace_error_buffer, 0, format, args);`
`1100`		`- DTRACE_ERROR(dtrace_error_buffer, error_filename, error_lineno);`
	`1100`	`+ DTRACE_ERROR(dtrace_error_buffer, (char *)error_filename, error_lineno);`
`1101`	`1101`	`efree(dtrace_error_buffer);`
`1102`	`1102`	`}`
`1103`	`1103`	`#endif /* HAVE_DTRACE */`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`#ifdef HAVE_DTRACE`
`26`	`26`	`/* PHP DTrace probes {{{ */`
`27`		`-static inline char *dtrace_get_executed_filename(TSRMLS_D)`
	`27`	`+static inline const char *dtrace_get_executed_filename(TSRMLS_D)`
`28`	`28`	`{`
`29`	`29`	`if (EG(current_execute_data) && EG(current_execute_data)->op_array) {`
`30`	`30`	`return EG(current_execute_data)->op_array->filename;`
`@@ -36,9 +36,9 @@ static inline char *dtrace_get_executed_filename(TSRMLS_D)`
`36`	`36`	`ZEND_API zend_op_array dtrace_compile_file(zend_file_handle file_handle, int type TSRMLS_DC)`
`37`	`37`	`{`
`38`	`38`	`zend_op_array *res;`
`39`		`- DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, file_handle->filename);`
	`39`	`+ DTRACE_COMPILE_FILE_ENTRY(file_handle->opened_path, (char *)file_handle->filename);`
`40`	`40`	`res = compile_file(file_handle, type TSRMLS_CC);`
`41`		`- DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, file_handle->filename);`
	`41`	`+ DTRACE_COMPILE_FILE_RETURN(file_handle->opened_path, (char *)file_handle->filename);`
`42`	`42`
`43`	`43`	`return res;`
`44`	`44`	`}`
`@@ -47,7 +47,7 @@ ZEND_API zend_op_array dtrace_compile_file(zend_file_handle file_handle, int t`
`47`	`47`	`ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)`
`48`	`48`	`{`
`49`	`49`	`int lineno;`
`50`		`- char scope, filename, funcname, classname;`
	`50`	`+ const char scope, filename, funcname, classname;`
`51`	`51`	`scope = filename = funcname = classname = NULL;`
`52`	`52`
`53`	`53`	`/* we need filename and lineno for both execute and function probes */`
`@@ -65,41 +65,41 @@ ZEND_API void dtrace_execute(zend_op_array *op_array TSRMLS_DC)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (DTRACE_EXECUTE_ENTRY_ENABLED()) {`
`68`		`- DTRACE_EXECUTE_ENTRY(filename, lineno);`
	`68`	`+ DTRACE_EXECUTE_ENTRY((char *)filename, lineno);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if (DTRACE_FUNCTION_ENTRY_ENABLED() && funcname != NULL) {`
`72`		`- DTRACE_FUNCTION_ENTRY(funcname, filename, lineno, classname, scope);`
	`72`	`+ DTRACE_FUNCTION_ENTRY((char )funcname, (char )filename, lineno, (char )classname, (char )scope);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`execute(op_array TSRMLS_CC);`
`76`	`76`
`77`	`77`	`if (DTRACE_FUNCTION_RETURN_ENABLED() && funcname != NULL) {`
`78`		`- DTRACE_FUNCTION_RETURN(funcname, filename, lineno, classname, scope);`
	`78`	`+ DTRACE_FUNCTION_RETURN((char )funcname, (char )filename, lineno, (char )classname, (char )scope);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`if (DTRACE_EXECUTE_RETURN_ENABLED()) {`
`82`		`- DTRACE_EXECUTE_RETURN(filename, lineno);`
	`82`	`+ DTRACE_EXECUTE_RETURN((char *)filename, lineno);`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`ZEND_API void dtrace_execute_internal(zend_execute_data *execute_data_ptr, int return_value_used TSRMLS_DC)`
`87`	`87`	`{`
`88`	`88`	`int lineno;`
`89`		`- char *filename;`
	`89`	`+ const char *filename;`
`90`	`90`	`if (DTRACE_EXECUTE_ENTRY_ENABLED() \|\| DTRACE_EXECUTE_RETURN_ENABLED()) {`
`91`	`91`	`filename = dtrace_get_executed_filename(TSRMLS_C);`
`92`	`92`	`lineno = zend_get_executed_lineno(TSRMLS_C);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (DTRACE_EXECUTE_ENTRY_ENABLED()) {`
`96`		`- DTRACE_EXECUTE_ENTRY(filename, lineno);`
	`96`	`+ DTRACE_EXECUTE_ENTRY((char *)filename, lineno);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`execute_internal(execute_data_ptr, return_value_used TSRMLS_CC);`
`100`	`100`
`101`	`101`	`if (DTRACE_EXECUTE_RETURN_ENABLED()) {`
`102`		`- DTRACE_EXECUTE_RETURN(filename, lineno);`
	`102`	`+ DTRACE_EXECUTE_RETURN((char *)filename, lineno);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
Original file line number	Diff line number	Diff line change
`@@ -2984,7 +2984,7 @@ ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, CV)`
`2984`	`2984`
`2985`	`2985`	`#ifdef HAVE_DTRACE`
`2986`	`2986`	`if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {`
`2987`		`- DTRACE_EXCEPTION_CAUGHT(ce->name);`
	`2987`	`+ DTRACE_EXCEPTION_CAUGHT((char *)ce->name);`
`2988`	`2988`	`}`
`2989`	`2989`	`#endif /* HAVE_DTRACE */`
`2990`	`2990`
Original file line number	Diff line number	Diff line change
`@@ -6279,7 +6279,7 @@ static int ZEND_FASTCALL ZEND_CATCH_SPEC_CONST_CV_HANDLER(ZEND_OPCODE_HANDLER_A`
`6279`	`6279`
`6280`	`6280`	`#ifdef HAVE_DTRACE`
`6281`	`6281`	`if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {`
`6282`		`- DTRACE_EXCEPTION_CAUGHT(ce->name);`
	`6282`	`+ DTRACE_EXCEPTION_CAUGHT((char *)ce->name);`
`6283`	`6283`	`}`
`6284`	`6284`	`#endif /* HAVE_DTRACE */`
`6285`	`6285`