cvs: php-src /ext/sqlite3 php_sqlite3_structs.h sqlite3.c

From: Date: Fri, 01 Aug 2008 08:27:47 +0000
Subject: cvs: php-src /ext/sqlite3 php_sqlite3_structs.h sqlite3.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-51856@lists.php.net to get a copy of this message
tony2001 Fri Aug 1 08:27:47 2008 UTC Modified files: /php-src/ext/sqlite3 php_sqlite3_structs.h sqlite3.c Log: fix int<->long mess causing lots of segfaults on x86_64 http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/php_sqlite3_structs.h?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/sqlite3/php_sqlite3_structs.h diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.3 php-src/ext/sqlite3/php_sqlite3_structs.h:1.4 --- php-src/ext/sqlite3/php_sqlite3_structs.h:1.3 Tue Jul 29 00:56:22 2008 +++ php-src/ext/sqlite3/php_sqlite3_structs.h Fri Aug 1 08:27:46 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sqlite3_structs.h,v 1.3 2008/07/29 00:56:22 scottmac Exp $ */ +/* $Id: php_sqlite3_structs.h,v 1.4 2008/08/01 08:27:46 tony2001 Exp $ */ #ifndef PHP_SQLITE_STRUCTS_H #define PHP_SQLITE_STRUCTS_H @@ -41,7 +41,7 @@ long param_number; char *name; int name_len; - int type; + long type; zval *parameter; }; http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.8&r2=1.9&diff_format=u Index: php-src/ext/sqlite3/sqlite3.c diff -u php-src/ext/sqlite3/sqlite3.c:1.8 php-src/ext/sqlite3/sqlite3.c:1.9 --- php-src/ext/sqlite3/sqlite3.c:1.8 Thu Jul 31 16:35:33 2008 +++ php-src/ext/sqlite3/sqlite3.c Fri Aug 1 08:27:46 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sqlite3.c,v 1.8 2008/07/31 16:35:33 scottmac Exp $ */ +/* $Id: sqlite3.c,v 1.9 2008/08/01 08:27:46 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -72,7 +72,8 @@ zval *object = getThis(); char *filename, *encryption_key, *fullpath; zend_uchar filename_type; - int filename_len, encryption_key_len, flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; + int filename_len, encryption_key_len; + long flags = SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE; db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC); if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "t|lS", &filename, &filename_len, &filename_type, &flags, &encryption_key, &encryption_key_len)) { @@ -536,7 +537,8 @@ php_sqlite3_db_object *db_obj; zval *object = getThis(); char *sql, *errtext = NULL; - int sql_len, return_code, entire_row = 0; + int sql_len, return_code; + zend_bool entire_row = 0; sqlite3_stmt *stmt; db_obj = (php_sqlite3_db_object *)zend_object_store_get_object(object TSRMLS_CC); @@ -1145,7 +1147,7 @@ break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown parameter type: %d for parameter %ld", param->type, param->param_number); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown parameter type: %ld for parameter %ld", param->type, param->param_number); RETURN_FALSE; } zend_hash_move_forward(stmt_obj->bound_params); @@ -1216,7 +1218,7 @@ { php_sqlite3_result *result_obj; zval *object = getThis(); - int column = 0; + long column = 0; result_obj = (php_sqlite3_result *)zend_object_store_get_object(object TSRMLS_CC); SQLITE3_CHECK_INITIALIZED(result_obj->stmt_obj->initialised, SQLite3_result) @@ -1235,7 +1237,7 @@ { php_sqlite3_result *result_obj; zval *object = getThis(); - int column = 0; + long column = 0; result_obj = (php_sqlite3_result *)zend_object_store_get_object(object TSRMLS_CC); SQLITE3_CHECK_INITIALIZED(result_obj->stmt_obj->initialised, SQLite3_result) @@ -1254,7 +1256,8 @@ { php_sqlite3_result *result_obj; zval *object = getThis(); - int i, ret, mode = PHP_SQLITE3_BOTH; + int i, ret; + long mode = PHP_SQLITE3_BOTH; result_obj = (php_sqlite3_result *)zend_object_store_get_object(object TSRMLS_CC); SQLITE3_CHECK_INITIALIZED(result_obj->stmt_obj->initialised, SQLite3_result)

« previous php.cvs (#51856) next »