master renames phase 3

This commit is contained in:
Anatol Belski 2014-08-25 20:22:49 +02:00
parent 6f9f0bf205
commit 4d997f63d9
131 changed files with 635 additions and 643 deletions

View file

@ -230,7 +230,7 @@ stmt_retry:
}
if (status == PGRES_COMMAND_OK) {
ZEND_ATOI(stmt->row_count, PQcmdTuples(S->result));
ZEND_ATOL(stmt->row_count, PQcmdTuples(S->result));
H->pgoid = PQoidValue(S->result);
} else {
stmt->row_count = (zend_long)PQntuples(S->result);
@ -256,14 +256,14 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
/* decode name from $1, $2 into 0, 1 etc. */
if (param->name) {
if (param->name->val[0] == '$') {
ZEND_ATOI(param->paramno, param->name->val + 1);
ZEND_ATOL(param->paramno, param->name->val + 1);
} else {
/* resolve parameter name to rewritten name */
char *namevar;
if (stmt->bound_param_map && (namevar = zend_hash_find_ptr(stmt->bound_param_map,
param->name)) != NULL) {
ZEND_ATOI(param->paramno, namevar + 1);
ZEND_ATOL(param->paramno, namevar + 1);
param->paramno--;
} else {
pdo_raise_impl_error(stmt->dbh, stmt, "HY093", param->name->val TSRMLS_CC);
@ -519,7 +519,7 @@ static int pgsql_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, zend_ulon
switch (cols[colno].param_type) {
case PDO_PARAM_INT:
ZEND_ATOI(S->cols[colno].intval, *ptr);
ZEND_ATOL(S->cols[colno].intval, *ptr);
*ptr = (char *) &(S->cols[colno].intval);
*len = sizeof(zend_long);
break;