[PHP-CVS] svn: /php/php-src/trunk/ext/pdo/ pdo_stmt.c

2010-12-23 Thread Ilia Alshanetsky
iliaaThu, 23 Dec 2010 14:38:15 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306588

Log:
Fixed compiler warning

Changed paths:
U   php/php-src/trunk/ext/pdo/pdo_stmt.c

Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===
--- php/php-src/trunk/ext/pdo/pdo_stmt.c2010-12-23 10:59:04 UTC (rev 
306587)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c2010-12-23 14:38:15 UTC (rev 
306588)
@@ -2183,7 +2183,7 @@
php_stream_printf(out TSRMLS_CC, Key: Name: 
[%d] %.*s\n, len, len, str);
}

-   php_stream_printf(out TSRMLS_CC, paramno=%d\nname=[%d] 
\%.*s\\nis_param=%d\nparam_type=%d\n,
+   php_stream_printf(out TSRMLS_CC, 
paramno=%ld\nname=[%d] \%.*s\\nis_param=%d\nparam_type=%d\n,
param-paramno, param-namelen, param-namelen, 
param-name ? param-name : ,
param-is_param,
param-param_type);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/pdo/ pdo_stmt.c

2010-06-02 Thread Felipe Pena
felipe   Wed, 02 Jun 2010 16:54:13 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=300097

Log:
- Removed clone_obj from PDORow object handlers, as 
zend_objects_store_clone_obj requires a clone handler (ce-clone == NULL - 
error) and it is not supplied, hence it is being useless and leading 
ReflectionClass::isCloneable() to give false positive information

Changed paths:
U   php/php-src/trunk/ext/pdo/pdo_stmt.c

Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===
--- php/php-src/trunk/ext/pdo/pdo_stmt.c2010-06-02 15:29:42 UTC (rev 
300096)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c2010-06-02 16:54:13 UTC (rev 
300097)
@@ -2754,7 +2754,9 @@
 }

 zend_object_handlers pdo_row_object_handlers = {
-   ZEND_OBJECTS_STORE_HANDLERS,
+   zend_objects_store_add_ref,
+   zend_objects_store_del_ref,
+   NULL,
row_prop_read,
row_prop_write,
row_dim_read,

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ext/pdo/ pdo_stmt.c

2009-10-12 Thread Felipe Pena
felipe   Mon, 12 Oct 2009 17:20:30 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=289582

Log:
- Fixed class name in row_get_classname (PDORow)

Changed paths:
U   php/php-src/trunk/ext/pdo/pdo_stmt.c

Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===
--- php/php-src/trunk/ext/pdo/pdo_stmt.c2009-10-12 17:09:11 UTC (rev 
289581)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c2009-10-12 17:20:30 UTC (rev 
289582)
@@ -2796,7 +2796,7 @@
int namelen = sizeof(__construct);

ctor.type = ZEND_INTERNAL_FUNCTION;
-   ctor.function_name.u = malloc(UBYTES(namelen));
+   ctor.function_name.u = emalloc(UBYTES(namelen));
u_charsToUChars(__construct, ctor.function_name.u, namelen);

ctor.scope = pdo_row_ce;
@@ -2815,8 +2815,10 @@
if (parent) {
return FAILURE;
} else {
-   *class_name = ezstrndup(IS_UNICODE, ZSTR(PDORow), 
sizeof(PDORow) - 1);
-   *class_name_len = sizeof(PDORow)-1;
+   int namelen = sizeof(PDORow);
+
+   (*class_name).u = emalloc(UBYTES(namelen));
+   u_charsToUChars(PDORow, (*class_name).u, namelen);
return SUCCESS;
}
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: php/php-src/trunk/ext/pdo/ pdo_stmt.c

2009-07-16 Thread Felipe Pena
felipe  Thu, 16 Jul 2009 22:37:24 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284208

Changed paths:
U   php/php-src/trunk/ext/pdo/pdo_stmt.c

Log:
- MFB: Double to string conversion fix (#41698 #48924)

Modified: php/php-src/trunk/ext/pdo/pdo_stmt.c
===
--- php/php-src/trunk/ext/pdo/pdo_stmt.c2009-07-16 22:27:52 UTC (rev 
284207)
+++ php/php-src/trunk/ext/pdo/pdo_stmt.c2009-07-16 22:37:24 UTC (rev 
284208)
@@ -315,7 +315,13 @@
}

if (PDO_PARAM_TYPE(param-param_type) == PDO_PARAM_STR  
param-max_value_len = 0  ! ZVAL_IS_NULL(param-parameter)) {
-   convert_to_string(param-parameter);
+   if (Z_TYPE_P(param-parameter) == IS_DOUBLE) {
+   char *p;
+   int len = spprintf(p, 0, %.*H, (int) EG(precision), 
Z_DVAL_P(param-parameter));
+   ZVAL_STRINGL(param-parameter, p, len, 0);
+   } else {
+   convert_to_string(param-parameter);
+   }
} else if (PDO_PARAM_TYPE(param-param_type) == PDO_PARAM_INT  
Z_TYPE_P(param-parameter) == IS_BOOL) {
convert_to_long(param-parameter);
} else if (PDO_PARAM_TYPE(param-param_type) == PDO_PARAM_BOOL  
Z_TYPE_P(param-parameter) == IS_LONG) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php