cvs: ZendEngine2 / zend.h zend_execute.c zend_execute_API.c zend_indent.c zend_ini_scanner.c zend_ini_scanner_defs.h zend_interfaces.c zend_language_scanner.c zend_language_scanner_defs.h zend_stream.c zend_strtod.c zend_strtol.c zend_vm_execute.h
[email protected] ("Pierre-Alain Joye") Mon, 15 Jun 2009 14:06:31 -0000
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvspajoye1245074791@cvsserver> |
--pajoye1245074791
Content-Type: text/plain
pajoye Mon Jun 15 14:06:31 2009 UTC
Modified files:
/ZendEngine2 zend.h zend_execute.c zend_execute_API.c zend_indent.c
zend_ini_scanner.c zend_ini_scanner_defs.h
zend_interfaces.c zend_language_scanner.c
zend_language_scanner_defs.h zend_stream.c
zend_strtod.c zend_strtol.c zend_vm_execute.h
Log:
- silent compilation warnings (no MFH yet)
--pajoye1245074791
Content-Type: text/plain
Content-Disposition: attachment; filename="pajoye-20090615140631.txt"
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.371&r2=1.372&diff_format=u
Index: ZendEngine2/zend.h
diff -u ZendEngine2/zend.h:1.371 ZendEngine2/zend.h:1.372
--- ZendEngine2/zend.h:1.371 Fri Jun 5 22:19:59 2009
+++ ZendEngine2/zend.h Mon Jun 15 14:06:30 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend.h,v 1.371 2009/06/05 22:19:59 rasmus Exp $ */
+/* $Id: zend.h,v 1.372 2009/06/15 14:06:30 pajoye Exp $ */
#ifndef ZEND_H
#define ZEND_H
@@ -268,6 +268,8 @@
extern ZEND_API zstr null_zstr;
extern ZEND_API zstr empty_zstr;
+/* TODO: get rid of this inline as well or figure out a way to deal with:
+ Zend\zend_hash.c(343) : warning C4090: 'function' : different 'const' qualifiers */
static inline zstr _to_zstr(void *v) {
zstr ret;
ret.v = v;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.814&r2=1.815&diff_format=u
Index: ZendEngine2/zend_execute.c
diff -u ZendEngine2/zend_execute.c:1.814 ZendEngine2/zend_execute.c:1.815
--- ZendEngine2/zend_execute.c:1.814 Thu Jun 4 18:18:46 2009
+++ ZendEngine2/zend_execute.c Mon Jun 15 14:06:30 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute.c,v 1.814 2009/06/04 18:18:46 mattwil Exp $ */
+/* $Id: zend_execute.c,v 1.815 2009/06/15 14:06:30 pajoye Exp $ */
#define ZEND_INTENSIVE_DEBUGGING 0
@@ -196,7 +196,7 @@
/* T->str_offset.str here is always IS_STRING or IS_UNICODE */
if (Z_TYPE_P(T->str_offset.str) == IS_STRING) {
if (((int)T->str_offset.offset<0)
- || (Z_STRLEN_P(T->str_offset.str) <= T->str_offset.offset)) {
+ || ((unsigned int)Z_STRLEN_P(T->str_offset.str) <= T->str_offset.offset)) {
Z_STRVAL_P(ptr) = STR_EMPTY_ALLOC();
Z_STRLEN_P(ptr) = 0;
} else {
@@ -206,7 +206,7 @@
Z_TYPE_P(ptr) = IS_STRING;
} else {
if (((int)T->str_offset.offset<0)
- || (Z_USTRCPLEN_P(T->str_offset.str) <= T->str_offset.offset)) {
+ || ((unsigned int)Z_USTRCPLEN_P(T->str_offset.str) <= T->str_offset.offset)) {
Z_USTRVAL_P(ptr) = USTR_MAKE("");
Z_USTRLEN_P(ptr) = 0;
} else {
@@ -659,7 +659,7 @@
return 0;
}
- if (T->str_offset.offset >= Z_STRLEN_P(T->str_offset.str)) {
+ if (T->str_offset.offset >= (unsigned int)Z_STRLEN_P(T->str_offset.str)) {
Z_STRVAL_P(T->str_offset.str) = (char *) erealloc(Z_STRVAL_P(T->str_offset.str), T->str_offset.offset+1+1);
memset(Z_STRVAL_P(T->str_offset.str) + Z_STRLEN_P(T->str_offset.str),
' ',
@@ -696,7 +696,7 @@
return 0;
}
- if (T->str_offset.offset >= Z_USTRLEN_P(T->str_offset.str)) {
+ if (T->str_offset.offset >= (unsigned int)Z_USTRLEN_P(T->str_offset.str)) {
Z_USTRVAL_P(T->str_offset.str) = (UChar *) eurealloc(Z_USTRVAL_P(T->str_offset.str), T->str_offset.offset+1+1);
u_memset(Z_USTRVAL_P(T->str_offset.str) + Z_USTRLEN_P(T->str_offset.str),
' ',
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute_API.c?r1=1.480&r2=1.481&diff_format=u
Index: ZendEngine2/zend_execute_API.c
diff -u ZendEngine2/zend_execute_API.c:1.480 ZendEngine2/zend_execute_API.c:1.481
--- ZendEngine2/zend_execute_API.c:1.480 Fri Jun 5 18:50:10 2009
+++ ZendEngine2/zend_execute_API.c Mon Jun 15 14:06:30 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_execute_API.c,v 1.480 2009/06/05 18:50:10 mattwil Exp $ */
+/* $Id: zend_execute_API.c,v 1.481 2009/06/15 14:06:30 pajoye Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -867,7 +867,7 @@
}
}
- ZEND_VM_STACK_GROW_IF_NEEDED(fci->param_count + 1);
+ ZEND_VM_STACK_GROW_IF_NEEDED((int)(fci->param_count + 1));
for (i=0; i<fci->param_count; i++) {
zval *param;
@@ -1806,7 +1806,7 @@
ex->CVs[ex->op_array->this_var] = (zval**)ex->CVs + ex->op_array->last_var + ex->op_array->this_var;
*ex->CVs[ex->op_array->this_var] = EG(This);
}
- for (i = 0; i < ex->op_array->last_var; i++) {
+ for (i = 0; i < (zend_uint) ex->op_array->last_var; i++) {
if (ex->CVs[i]) {
zend_u_hash_quick_update(EG(active_symbol_table),
type,
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_indent.c?r1=1.32&r2=1.33&diff_format=u
Index: ZendEngine2/zend_indent.c
diff -u ZendEngine2/zend_indent.c:1.32 ZendEngine2/zend_indent.c:1.33
--- ZendEngine2/zend_indent.c:1.32 Wed Dec 31 11:12:29 2008
+++ ZendEngine2/zend_indent.c Mon Jun 15 14:06:30 2009
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_indent.c,v 1.32 2008/12/31 11:12:29 sebastian Exp $ */
+/* $Id: zend_indent.c,v 1.33 2009/06/15 14:06:30 pajoye Exp $ */
/* This indenter doesn't really work, it's here for no particular reason. */
@@ -30,10 +30,10 @@
#define zendtext LANG_SCNG(yy_text)
#define zendleng LANG_SCNG(yy_leng)
-static void handle_whitespace(int *emit_whitespace) /* {{{ */
+static void handle_whitespace(unsigned int *emit_whitespace) /* {{{ */
{
unsigned char c;
- int i;
+ unsigned int i;
for (c=0; c<128; c++) {
if (emit_whitespace[c]>0) {
@@ -51,9 +51,9 @@
zval token;
int token_type;
int in_string=0;
- int nest_level=0;
- int emit_whitespace[256];
- int i;
+ unsigned int nest_level=0;
+ unsigned int emit_whitespace[256];
+ unsigned int i;
TSRMLS_FETCH();
memset(emit_whitespace, 0, sizeof(int)*256);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner.c?r1=1.13&r2=1.14&diff_format=u
Index: ZendEngine2/zend_ini_scanner.c
diff -u ZendEngine2/zend_ini_scanner.c:1.13 ZendEngine2/zend_ini_scanner.c:1.14
--- ZendEngine2/zend_ini_scanner.c:1.13 Tue May 19 15:59:25 2009
+++ ZendEngine2/zend_ini_scanner.c Mon Jun 15 14:06:30 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue May 19 08:46:59 2009 */
+/* Generated by re2c 0.13.5 on Wed Jun 03 09:59:17 2009 */
#line 1 "Zend/zend_ini_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_ini_scanner.c,v 1.13 2009/05/19 15:59:25 shire Exp $ */
+/* $Id: zend_ini_scanner.c,v 1.14 2009/06/15 14:06:30 pajoye Exp $ */
#include <errno.h>
#include "zend.h"
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini_scanner_defs.h?r1=1.11&r2=1.12&diff_format=u
Index: ZendEngine2/zend_ini_scanner_defs.h
diff -u ZendEngine2/zend_ini_scanner_defs.h:1.11 ZendEngine2/zend_ini_scanner_defs.h:1.12
--- ZendEngine2/zend_ini_scanner_defs.h:1.11 Tue May 19 15:59:25 2009
+++ ZendEngine2/zend_ini_scanner_defs.h Mon Jun 15 14:06:30 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Tue May 19 08:46:59 2009 */
+/* Generated by re2c 0.13.5 on Wed Jun 03 09:59:17 2009 */
#line 3 "Zend/zend_ini_scanner_defs.h"
enum YYCONDTYPE {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_interfaces.c?r1=1.77&r2=1.78&diff_format=u
Index: ZendEngine2/zend_interfaces.c
diff -u ZendEngine2/zend_interfaces.c:1.77 ZendEngine2/zend_interfaces.c:1.78
--- ZendEngine2/zend_interfaces.c:1.77 Wed Mar 25 10:39:36 2009
+++ ZendEngine2/zend_interfaces.c Mon Jun 15 14:06:30 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_interfaces.c,v 1.77 2009/03/25 10:39:36 dmitry Exp $ */
+/* $Id: zend_interfaces.c,v 1.78 2009/06/15 14:06:30 pajoye Exp $ */
#include "zend.h"
#include "zend_API.h"
@@ -349,7 +349,8 @@
/* {{{ zend_implement_aggregate */
static int zend_implement_aggregate(zend_class_entry *interface, zend_class_entry *class_type TSRMLS_DC)
{
- int i, t = -1;
+ unsigned int i;
+ int t = -1;
if (class_type->get_iterator) {
if (class_type->type == ZEND_INTERNAL_CLASS) {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.28&r2=1.29&diff_format=u
Index: ZendEngine2/zend_language_scanner.c
diff -u ZendEngine2/zend_language_scanner.c:1.28 ZendEngine2/zend_language_scanner.c:1.29
--- ZendEngine2/zend_language_scanner.c:1.28 Mon May 25 14:32:13 2009
+++ ZendEngine2/zend_language_scanner.c Mon Jun 15 14:06:30 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 25 10:34:14 2009 */
+/* Generated by re2c 0.13.5 on Wed Jun 03 09:59:17 2009 */
#line 1 "Zend/zend_language_scanner.l"
/*
+----------------------------------------------------------------------+
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.c,v 1.28 2009/05/25 14:32:13 felipe Exp $ */
+/* $Id: zend_language_scanner.c,v 1.29 2009/06/15 14:06:30 pajoye Exp $ */
#if 0
# define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner_defs.h?r1=1.19&r2=1.20&diff_format=u
Index: ZendEngine2/zend_language_scanner_defs.h
diff -u ZendEngine2/zend_language_scanner_defs.h:1.19 ZendEngine2/zend_language_scanner_defs.h:1.20
--- ZendEngine2/zend_language_scanner_defs.h:1.19 Tue May 5 01:44:33 2009
+++ ZendEngine2/zend_language_scanner_defs.h Mon Jun 15 14:06:30 2009
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.13.5 on Mon May 04 20:02:45 2009 */
+/* Generated by re2c 0.13.5 on Wed Jun 03 09:59:17 2009 */
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_stream.c?r1=1.27&r2=1.28&diff_format=u
Index: ZendEngine2/zend_stream.c
diff -u ZendEngine2/zend_stream.c:1.27 ZendEngine2/zend_stream.c:1.28
--- ZendEngine2/zend_stream.c:1.27 Thu Mar 26 17:29:01 2009
+++ ZendEngine2/zend_stream.c Mon Jun 15 14:06:30 2009
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_stream.c,v 1.27 2009/03/26 17:29:01 dmitry Exp $ */
+/* $Id: zend_stream.c,v 1.28 2009/06/15 14:06:30 pajoye Exp $ */
#include "zend.h"
@@ -274,7 +274,9 @@
memset(file_handle->handle.stream.mmap.buf + file_handle->handle.stream.mmap.len, 0, ZEND_MMAP_AHEAD);
}
+#if HAVE_MMAP
return_mapped:
+#endif
file_handle->type = ZEND_HANDLE_MAPPED;
file_handle->handle.stream.mmap.pos = 0;
file_handle->handle.stream.mmap.old_handle = file_handle->handle.stream.handle;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_strtod.c?r1=1.42&r2=1.43&diff_format=u
Index: ZendEngine2/zend_strtod.c
diff -u ZendEngine2/zend_strtod.c:1.42 ZendEngine2/zend_strtod.c:1.43
--- ZendEngine2/zend_strtod.c:1.42 Wed Mar 18 10:49:35 2009
+++ ZendEngine2/zend_strtod.c Mon Jun 15 14:06:30 2009
@@ -89,7 +89,7 @@
* directly -- and assumed always to succeed.
*/
-/* $Id: zend_strtod.c,v 1.42 2009/03/18 10:49:35 dmitry Exp $ */
+/* $Id: zend_strtod.c,v 1.43 2009/06/15 14:06:30 pajoye Exp $ */
#include <zend.h>
#include <unicode/utypes.h>
@@ -506,9 +506,10 @@
/* return value is only used as a simple string, so mis-aligned parts
* inside the Bigint are not at risk on strict align architectures
*/
-static char * rv_alloc(int i) /* {{{ */
+static char * rv_alloc(unsigned int i) /* {{{ */
{
- int j, k, *r;
+ unsigned int k;
+ int j, *r;
j = sizeof(ULong);
for(k = 0;
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_strtol.c?r1=1.5&r2=1.6&diff_format=u
Index: ZendEngine2/zend_strtol.c
diff -u ZendEngine2/zend_strtol.c:1.5 ZendEngine2/zend_strtol.c:1.6
--- ZendEngine2/zend_strtol.c:1.5 Wed Dec 27 15:23:45 2006
+++ ZendEngine2/zend_strtol.c Mon Jun 15 14:06:30 2009
@@ -40,6 +40,12 @@
#include <unicode/utypes.h>
#include <unicode/uchar.h>
+/* Disable false positive warning about LONG_MIN, we could use INT_MIN but requires
+ too much code changes for no gain. */
+#ifdef PHP_WIN32
+# pragma warning (disable:4146)
+#endif
+
/* long zend_u_strtol (const UChar *nptr, UChar **endptr, int base) {{{
* Convert a Unicode string to a long integer.
*
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.273&r2=1.274&diff_format=u
Index: ZendEngine2/zend_vm_execute.h
diff -u ZendEngine2/zend_vm_execute.h:1.273 ZendEngine2/zend_vm_execute.h:1.274
--- ZendEngine2/zend_vm_execute.h:1.273 Sun Jun 7 15:45:46 2009
+++ ZendEngine2/zend_vm_execute.h Mon Jun 15 14:06:30 2009
@@ -24,6 +24,9 @@
static opcode_handler_t zend_vm_get_opcode_handler(zend_uchar opcode, zend_op* op);
+#ifdef PHP_WIN32
+#pragma warning (disable:4101)
+#endif
#define ZEND_VM_CONTINUE() return 0
#define ZEND_VM_RETURN() return 1
@@ -650,12 +653,12 @@
for (i=0; i<EX(op_array)->last_brk_cont; i++) {
if (EX(op_array)->brk_cont_array[i].start < 0) {
continue;
- } else if (EX(op_array)->brk_cont_array[i].start > op_num) {
+ } else if ((zend_uint)EX(op_array)->brk_cont_array[i].start > op_num) {
/* further blocks will not be relevant... */
break;
- } else if (op_num < EX(op_array)->brk_cont_array[i].brk) {
+ } else if (op_num < (zend_uint)EX(op_array)->brk_cont_array[i].brk) {
if (!catched ||
- catch_op_num >= EX(op_array)->brk_cont_array[i].brk) {
+ catch_op_num >= (zend_uint)EX(op_array)->brk_cont_array[i].brk) {
zend_op *brk_opline = &EX(op_array)->opcodes[EX(op_array)->brk_cont_array[i].brk];
switch (brk_opline->opcode) {
@@ -31283,6 +31286,7 @@
static int ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_error_noreturn(E_ERROR, "Invalid opcode %d/%d/%d.", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);
+ return 0;
}
--pajoye1245074791--