tony2001                Fri Aug  1 08:27:57 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/sqlite3        php_sqlite3_structs.h sqlite3.c 
  Log:
  MFH: 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.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/sqlite3/php_sqlite3_structs.h
diff -u php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.4 
php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.5
--- php-src/ext/sqlite3/php_sqlite3_structs.h:1.1.2.4   Tue Jul 29 00:56:53 2008
+++ php-src/ext/sqlite3/php_sqlite3_structs.h   Fri Aug  1 08:27:56 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_sqlite3_structs.h,v 1.1.2.4 2008/07/29 00:56:53 scottmac Exp $ */
+/* $Id: php_sqlite3_structs.h,v 1.1.2.5 2008/08/01 08:27:56 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.1.2.7&r2=1.1.2.8&diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.7 
php-src/ext/sqlite3/sqlite3.c:1.1.2.8
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.7       Thu Jul 31 22:30:26 2008
+++ php-src/ext/sqlite3/sqlite3.c       Fri Aug  1 08:27:56 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: sqlite3.c,v 1.1.2.7 2008/07/31 22:30:26 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.8 2008/08/01 08:27:56 tony2001 Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -70,7 +70,8 @@
        php_sqlite3_db_object *db_obj;
        zval *object = getThis();
        char *filename, *encryption_key, *fullpath;
-       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, "s|ls", 
&filename, &filename_len, &flags, &encryption_key, &encryption_key_len)) {
@@ -518,7 +519,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);
 
@@ -1117,7 +1119,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);
@@ -1188,7 +1190,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, 
SQLite3Result)
@@ -1207,7 +1209,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, 
SQLite3Result)
@@ -1226,7 +1228,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, 
SQLite3Result)



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

Reply via email to