Refactor pdo_sqlite (only compilable)

andreyhristov · Apr 23, 2014 · a30442c · a30442c
1 parent bd9f575
commit a30442c
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 115 deletions.
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
@@ -187,7 +187,7 @@ PDO_API int php_pdo_register_driver(pdo_driver_t *driver)
 		return FAILURE;	/* NOTREACHED */
 	}
 
-	return zend_hash_str_add_mem(&pdo_driver_hash, (char*)driver->driver_name, driver->driver_name_len, (void**)&driver, sizeof(pdo_driver_t *)) != NULL;
+	return zend_hash_str_add_ptr(&pdo_driver_hash, (char*)driver->driver_name, driver->driver_name_len, driver) != NULL;
 }
 
 PDO_API void php_pdo_unregister_driver(pdo_driver_t *driver)

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
@@ -207,6 +207,7 @@ static PHP_METHOD(PDO, dbh_constructor)
 	zval *options = NULL;
 	char alt_dsn[512];
 	int call_factory = 1;
+	char tmp;
 
 	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s!s!a!", &data_source, &data_source_len,
 				&username, &usernamelen, &password, &passwordlen, &options)) {
@@ -254,8 +255,10 @@ static PHP_METHOD(PDO, dbh_constructor)
 		}
 	}
 
+	tmp = data_source[colon - data_source];
+	data_source[colon - data_source] = '\0';
 	driver = pdo_find_driver(data_source, colon - data_source);
-
+	data_source[colon - data_source] = tmp;
 	if (!driver) {
 		/* NB: don't want to include the data_source in the error message as
 		 * it might contain a password */

diff --git a/ext/pdo_sqlite/php_pdo_sqlite_int.h b/ext/pdo_sqlite/php_pdo_sqlite_int.h
@@ -38,7 +38,7 @@ struct pdo_sqlite_fci {
 struct pdo_sqlite_func {
 	struct pdo_sqlite_func *next;
 
-	zval *func, *step, *fini;
+	zval func, step, fini;
 	int argc;
 	const char *funcname;
 
@@ -50,7 +50,7 @@ struct pdo_sqlite_collation {
 	struct pdo_sqlite_collation *next;
 
 	const char *name;
-	zval *callback;
+	zval callback;
 	struct pdo_sqlite_fci fc;
 };