colder Thu, 29 Apr 2010 17:14:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298782
Log:
Fix misplaced code
Changed paths:
U php/php-src/trunk/ext/spl/spl_observer.c
Modified: php/php-src/trunk/ext/spl/spl_observer.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_observer.c 2010-04-29 15:49:51 UTC (rev
298781)
+++ php/php-src/trunk/ext/spl/spl_observer.c 2010-04-29 17:14:37 UTC (rev
298782)
@@ -139,6 +139,11 @@
int hash_len = sizeof(zend_object_value);
#if HAVE_PACKED_OBJECT_VALUE
+
+ if (hash_len_ptr) {
+ *hash_len_ptr = hash_len;
+ }
+
return (char*)&Z_OBJVAL_P(obj);
#else
char *hash = emalloc((hash_len+1)*sizeof(char *));
@@ -150,13 +155,13 @@
strncpy(hash, (char *)&zvalue, hash_len);
hash[hash_len] = 0;
-#endif
if (hash_len_ptr) {
*hash_len_ptr = hash_len;
}
-
+
return hash;
+#endif
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
