diff options
| author | Anatol Belski <ab@php.net> | 2013-08-12 15:52:50 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-08-12 15:52:50 +0200 |
| commit | bab33f7e05fce2ec3834149826da6cbb1545d962 (patch) | |
| tree | 9dbb6c54cc98cb0962abbca4f3ea825cb2ae3607 | |
| parent | 87198989cd39e139ea5343914db4e0e5750b19b0 (diff) | |
| parent | 72aacbf735c59d4414b6111284a6232befd093fc (diff) | |
| download | php-git-bab33f7e05fce2ec3834149826da6cbb1545d962.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
removed unused vars
| -rw-r--r-- | ext/pgsql/pgsql.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 7e42f151ca..f0e1780a79 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4350,7 +4350,6 @@ static void php_pgsql_escape_internal(INTERNAL_FUNCTION_PARAMETERS, int escape_l char *from = NULL, *to = NULL, *tmp = NULL; zval *pgsql_link = NULL; PGconn *pgsql; - int to_len; int from_len; int id = -1; @@ -6027,7 +6026,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con /* If field is NULL and HAS DEFAULT, should be skipped */ if (!skip_field) { char *escaped; - size_t new_len, field_len = strlen(field); + size_t field_len = strlen(field); if (_php_pgsql_detect_identifier_escape(field, field_len) == SUCCESS) { escaped = _php_pgsql_strndup(field, field_len); |