archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert (at Wez's request)

Browse source
This commit is contained in:
Ard Biesheuvel 2004-06-15 10:06:41 +00:00
parent 313c153274
commit e48d127244
3 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/pdo/pdo.c
View file

@ -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_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_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_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_LAZY", (long)PDO_FETCH_LAZY, CONST_CS|CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PDO_FETCH_ASSOC",(long)PDO_FETCH_ASSOC, CONST_CS|CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PDO_FETCH_ASSOC",(long)PDO_FETCH_ASSOC, CONST_CS|CONST_PERSISTENT);

24
ext/pdo/pdo_stmt.c
View file

@ -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); ZVAL_STRINGL(dest, value, value_len, 1);
break; 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: default:
ZVAL_NULL(dest); 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) 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; param.param_type = PDO_PARAM_STR;
if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, if (FAILURE == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
"lz|llz!", &param.paramno, &param.parameter, &param.param_type, &param.max_value_len, ZEND_NUM_ARGS() TSRMLS_CC, "sz|llz!",
&param.driver_params)) { &param.name, &param.namelen, &param.parameter, &param.param_type,
if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|llz!", &param.name, &param.max_value_len,
&param.namelen, &param.parameter, &param.param_type, &param.max_value_len,
&param.driver_params)) { &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; return 0;
} }
} }

4
ext/pdo/php_pdo_driver.h
View file

@ -43,7 +43,7 @@ enum pdo_param_type {
PDO_PARAM_STR, PDO_PARAM_STR,
PDO_PARAM_LOB, PDO_PARAM_LOB,
PDO_PARAM_STMT, /* hierarchical result set */ PDO_PARAM_STMT, /* hierarchical result set */
PDO_PARAM_DBL,
}; };
enum pdo_fetch_type { enum pdo_fetch_type {
@ -332,8 +332,6 @@ struct pdo_bound_param_data {
int is_param; /* parameter or column ? */ int is_param; /* parameter or column ? */
}; };
#define PDO_BOUND_PARAM_INIT { -1, NULL, 0 }
/* represents a prepared statement */ /* represents a prepared statement */
struct _pdo_stmt_t { struct _pdo_stmt_t {
/* driver specifics */ /* driver specifics */