diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 13:59:27 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 13:59:27 +0300 |
| commit | 7aa7627172c11979ec45c2db85f99182812ee59d (patch) | |
| tree | 90762a1d26b47213a9edd7016a9c45110156e24e /ext/pdo_firebird/firebird_statement.c | |
| parent | d554d64f649a915b4ecb3a1de409cfc8ff0e9133 (diff) | |
| download | php-git-7aa7627172c11979ec45c2db85f99182812ee59d.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'ext/pdo_firebird/firebird_statement.c')
| -rw-r--r-- | ext/pdo_firebird/firebird_statement.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pdo_firebird/firebird_statement.c b/ext/pdo_firebird/firebird_statement.c index 337ce3fb66..1e0151dc9d 100644 --- a/ext/pdo_firebird/firebird_statement.c +++ b/ext/pdo_firebird/firebird_statement.c @@ -198,7 +198,7 @@ static int firebird_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */ col->precision = -var->sqlscale; col->maxlen = var->sqllen; col->name = zend_string_alloc(colname_len, 0); - cp = col->name->val; + cp = ZSTR_VAL(col->name); if (colname_len > var->aliasname_length) { memmove(cp, var->relname, var->relname_length); cp += var->relname_length; @@ -475,10 +475,10 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat for (i = 0; i < sqlda->sqld; ++i) { XSQLVAR *var = &sqlda->sqlvar[i]; - if ((var->aliasname_length && !strncasecmp(param->name->val, var->aliasname, - min(param->name->len, var->aliasname_length))) - || (var->sqlname_length && !strncasecmp(param->name->val, var->sqlname, - min(param->name->len, var->sqlname_length)))) { + if ((var->aliasname_length && !strncasecmp(ZSTR_VAL(param->name), var->aliasname, + min(ZSTR_LEN(param->name), var->aliasname_length))) + || (var->sqlname_length && !strncasecmp(ZSTR_VAL(param->name), var->sqlname, + min(ZSTR_LEN(param->name), var->sqlname_length)))) { param->paramno = i; break; } @@ -631,7 +631,7 @@ static int firebird_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_dat } case PDO_PARAM_EVT_NORMALIZE: if (!param->is_param) { - char *s = param->name->val; + char *s = ZSTR_VAL(param->name); while (*s != '\0') { *s = toupper(*s); s++; |