Revert (at Wez's request)

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 74946323e5434747ee6f0c380bb7ced5a7f05927..580ee5a755ad0af2a5c68df595d22b58516a9b0f 100755 (executable)
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -209,7 +209,6 @@ PHP_MINIT_FUNCTION(pdo)
        REGISTER_LONG_CONSTANT("PDO_PARAM_STR",  (long)PDO_PARAM_STR,   CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_PARAM_LOB",  (long)PDO_PARAM_LOB,   CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_PARAM_STMT", (long)PDO_PARAM_STMT,  CONST_CS|CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("PDO_PARAM_DBL",  (long)PDO_PARAM_DBL,   CONST_CS|CONST_PERSISTENT);
 
        REGISTER_LONG_CONSTANT("PDO_FETCH_LAZY", (long)PDO_FETCH_LAZY,  CONST_CS|CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("PDO_FETCH_ASSOC",(long)PDO_FETCH_ASSOC, CONST_CS|CONST_PERSISTENT);

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 38b0063d8fb88b8855b6ae2f1db1ba9a7d26f583..0d8de561e68508855138cc58e155f26c72b5af74 100755 (executable)
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -378,16 +378,6 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno TSRMLS_DC
                                ZVAL_STRINGL(dest, value, value_len, 1);
                                break;
                        }
-               case PDO_PARAM_INT:
-                       if (value) {
-                               ZVAL_LONG(dest, *(long*)value);
-                               break;
-                       }
-               case PDO_PARAM_DBL:
-                       if (value) {
-                               ZVAL_DOUBLE(dest, *(double*)value);
-                               break;
-                       }
                default:
                        ZVAL_NULL(dest);
        }
@@ -559,16 +549,18 @@ static PHP_METHOD(PDOStatement, fetchAll)
 
 static int register_bound_param(INTERNAL_FUNCTION_PARAMETERS, pdo_stmt_t *stmt, int is_param)
 {
-       struct pdo_bound_param_data param = PDO_BOUND_PARAM_INIT;
+       struct pdo_bound_param_data param = {0};
 
+       param.paramno = -1;
        param.param_type = PDO_PARAM_STR;
 
-       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC,
-                       "lz|llz!", &param.paramno, &param.parameter, &param.param_type, &param.max_value_len,
-                       &param.driver_params)) {
-               if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|llz!", &param.name,
-                               &param.namelen, &param.parameter, &param.param_type, &param.max_value_len, 
+       if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
+                               ZEND_NUM_ARGS() TSRMLS_CC, "sz|llz!",
+                               &param.name, &param.namelen, &param.parameter, &param.param_type,
+                               &param.max_value_len,
                                &param.driver_params)) {
+               if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz|llz!", &param.paramno,
+                                       &param.parameter, &param.param_type, &param.max_value_len, &param.driver_params)) {
                        return 0;
                }       
        }

diff --git a/ext/pdo/php_pdo_driver.h b/ext/pdo/php_pdo_driver.h
index 63b2026466497100f053c531aa320f2ccd8ef880..c9a9efb63af2a2a17da9132e58deb3898f6ad121 100755 (executable)
--- a/ext/pdo/php_pdo_driver.h
+++ b/ext/pdo/php_pdo_driver.h
@@ -43,7 +43,7 @@ enum pdo_param_type {
        PDO_PARAM_STR,
        PDO_PARAM_LOB,
        PDO_PARAM_STMT, /* hierarchical result set */
-       PDO_PARAM_DBL,
+
 };
 
 enum pdo_fetch_type {
@@ -332,8 +332,6 @@ struct pdo_bound_param_data {
        int is_param;           /* parameter or column ? */
 };
 
-#define PDO_BOUND_PARAM_INIT { -1, NULL, 0 }
-
 /* represents a prepared statement */
 struct _pdo_stmt_t {
        /* driver specifics */