felipe Sat Mar 22 19:29:43 2008 UTC Modified files: /php-src/ext/pdo pdo_stmt.c Log: Fixed compilation warnings http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.190&r2=1.191&diff_format=u Index: php-src/ext/pdo/pdo_stmt.c diff -u php-src/ext/pdo/pdo_stmt.c:1.190 php-src/ext/pdo/pdo_stmt.c:1.191 --- php-src/ext/pdo/pdo_stmt.c:1.190 Tue Mar 4 23:39:15 2008 +++ php-src/ext/pdo/pdo_stmt.c Sat Mar 22 19:29:43 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo_stmt.c,v 1.190 2008/03/04 23:39:15 felipe Exp $ */ +/* $Id: pdo_stmt.c,v 1.191 2008/03/22 19:29:43 felipe Exp $ */ /* The PDO Statement Handle Class */ @@ -537,7 +537,7 @@ if (stmt->dbh->stringify || new_type == PDO_PARAM_STR) { char *buf = NULL; size_t len; - len = php_stream_copy_to_mem((php_stream*)value, &buf, PHP_STREAM_COPY_ALL, 0); + len = php_stream_copy_to_mem((php_stream*)value, (void *)&buf, PHP_STREAM_COPY_ALL, 0); if(buf == NULL) { ZVAL_EMPTY_STRING(dest); } else { @@ -2672,12 +2672,12 @@ return pdo_dbstmt_ce; } -static int row_get_classname(zval *object, char **class_name, zend_uint *class_name_len, int parent TSRMLS_DC) +static int row_get_classname(zval *object, zstr *class_name, zend_uint *class_name_len, int parent TSRMLS_DC) { if (parent) { return FAILURE; } else { - *class_name = UG(unicode) ? USTR_MAKE("PDORow") : estrndup("PDORow", sizeof("PDORow")-1); + *class_name = ezstrndup(ZEND_STR_TYPE, ZSTR("PDORow"), sizeof("PDORow") - 1); *class_name_len = sizeof("PDORow")-1; return SUCCESS; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php