diff options
| author | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-26 08:35:48 +0000 |
|---|---|---|
| committer | Jeroen van Wolffelaar <jeroen@php.net> | 2001-09-26 08:35:48 +0000 |
| commit | 21f2b9277ff3a878ca57559b96e692f3551320b8 (patch) | |
| tree | 2531c27273ebcf5c475ebc92979134ed89929185 /ext/oci8 | |
| parent | b0468809ff52a10653718cc47e8a760b8ac1b0ad (diff) | |
| download | php-git-21f2b9277ff3a878ca57559b96e692f3551320b8.tar.gz | |
3rd run in back-substitutin Z_* macro's. The val->Z_ cases are all solved now.
Diffstat (limited to 'ext/oci8')
| -rw-r--r-- | ext/oci8/oci8.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index 458b0a9738..e7513faae7 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -688,9 +688,9 @@ _oci_bind_post_exec(void *data TSRMLS_DC) zval *val = bind->zval; zval_dtor(val); ZVAL_NULL(val); - } else if (bind->Z_TYPE_P(zval) == IS_STRING && (bind->Z_STRVAL_P(zval) != empty_string)) { - bind->Z_STRVAL_P(zval) = erealloc(bind->Z_STRVAL_P(zval), bind->Z_STRLEN_P(zval)+1); - bind->Z_STRVAL_P(zval)[ bind->Z_STRLEN_P(zval) ] = '\0'; + } else if (Z_TYPE_P(bind->zval) == IS_STRING && (Z_STRVAL_P(bind->zval) != empty_string)) { + Z_STRVAL_P(bind->zval) = erealloc(Z_STRVAL_P(bind->zval), Z_STRLEN_P(bind->zval)+1); + Z_STRVAL_P(bind->zval)[ Z_STRLEN_P(bind->zval) ] = '\0'; } @@ -2056,11 +2056,11 @@ oci_bind_out_callback(dvoid *octxp, /* context pointer */ zval_dtor(val); Z_STRLEN_P(val) = OCI_PIECE_SIZE; /* 64K-1 is max XXX */ - Z_STRVAL_P(val) = emalloc(phpbind->Z_STRLEN_P(zval)); + Z_STRVAL_P(val) = emalloc(Z_STRLEN_P(phpbind->zval)); /* XXX we assume that zend-zval len has 4 bytes */ - *alenpp = (ub4*) &phpbind->Z_STRLEN_P(zval); - *bufpp = phpbind->Z_STRVAL_P(zval); + *alenpp = (ub4*) &Z_STRLEN_P(phpbind->zval); + *bufpp = Z_STRVAL_P(phpbind->zval); *piecep = OCI_ONE_PIECE; *rcodepp = &phpbind->retcode; *indpp = &phpbind->indicator; |