Changeset 272 for trunk

Timestamp:

08/09/2007 06:00:40 (16 months ago)

Author:

indeyets

Message:

gcc-2.95 compatibility patch (by Brian J. France)

Location:

trunk/ext/php

Files:

• CHANGELOG (modified) (1 diff)
• phpext.c (modified) (6 diffs)

trunk/ext/php/CHANGELOG

@@ -1 +1 @@
 --- %YAML:1.0
+- version: 0.9.2
+  date: 2007-08-??
+  status: beta
+  changes:
+    - short-and-flat arrays are dumped using inline-mode now (for readability)
+    - gcc-2.95 compatibility (patch by Brian J. France)
+
 - version: 0.9.1
   date: 2007-07-15

trunk/ext/php/phpext.c

@@ -202 +202 @@
                         } else if (strcmp(n->type_id, "bool") == 0) {
                                 /* implicit boolean */
-                                TSRMLS_FETCH();
                                 char *ptr = n->data.str->ptr;
                                 size_t len = n->data.str->len;
+                                TSRMLS_FETCH();
 
                                 if (len == 1) {
@@ -238 +238 @@
                                 }
                         } else if (strcmp(n->type_id, "int#hex") == 0) {
+                                long intVal;
                                 syck_str_blow_away_commas(n);
-                                long intVal = strtol(n->data.str->ptr, NULL, 16);
+                                intVal = strtol(n->data.str->ptr, NULL, 16);
                                 ZVAL_LONG(o, intVal);
                         } else if (strcmp(n->type_id, "int#base60") == 0) {
@@ -268 +269 @@
                                 ZVAL_LONG(o, total);
                         } else if (strcmp(n->type_id, "int#oct") == 0) {
+                                long intVal;
                                 syck_str_blow_away_commas(n);
-                                long intVal = strtol(n->data.str->ptr, NULL, 8);
+                                intVal = strtol(n->data.str->ptr, NULL, 8);
                                 ZVAL_LONG(o, intVal);
                         } else if (strcmp(n->type_id, "int") == 0) {
+                                long intVal;
                                 syck_str_blow_away_commas(n);
-                                long intVal = strtol(n->data.str->ptr, NULL, 10);
+                                intVal = strtol(n->data.str->ptr, NULL, 10);
                                 ZVAL_LONG(o, intVal);
                         } else if (strcmp(n->type_id, "float") == 0 || strcmp(n->type_id, "float#fix") == 0 || strcmp(n->type_id, "float#exp") == 0) {
@@ -314 +317 @@
                                 ZVAL_DOUBLE(o, -inf());
                         } else if (strncmp(n->type_id, "timestamp", 9) == 0) {
+                                zval fname, param, *params[1];
                                 TSRMLS_FETCH();
-                                zval fname, param, *params[1];
 
                                 ZVAL_STRING(&fname, "date_create", 1);
@@ -380 +383 @@
 SyckNode * php_syck_badanchor_handler(SyckParser *p, char *str)
 {
-        TSRMLS_FETCH();
         SyckNode *res;
         char *endl = p->cursor;
+        TSRMLS_FETCH();
 
         while (*endl != '\0' && *endl != '\n')
@@ -533 +536 @@
                 case IS_OBJECT:
                 {
-                        TSRMLS_FETCH();
                         char *name;
                         zend_uint name_len;
-                        zend_class_entry *ce = Z_OBJCE_P(data);
-
+                        zend_class_entry *ce;
+                        TSRMLS_FETCH();
+
+                        ce = Z_OBJCE_P(data);
                         zend_get_object_classname(data, &name, &name_len TSRMLS_CC);