archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove more unused local variables (GH-17688)

Browse source 
Since `pdo_odbc_ucs22utf8()` doesn't actually use the `stmt`, we drop
this parameter as well.
This commit is contained in:
Christoph M. Becker 2025-02-03 20:06:29 +01:00 • committed by GitHub
parent 1879ec1713
commit 4373c601ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/com_dotnet/com_handlers.c
View file

@ -249,7 +249,6 @@ static void function_dtor(zval *zv)
static PHP_FUNCTION(com_method_handler) static PHP_FUNCTION(com_method_handler)
{ {
zval *object = getThis(); zval *object = getThis();
zend_string *method = EX(func)->common.function_name;
zval *args = NULL; zval *args = NULL;
php_com_dotnet_object *obj = CDNO_FETCH(object); php_com_dotnet_object *obj = CDNO_FETCH(object);
int nargs; int nargs;

7
ext/pdo_odbc/odbc_stmt.c
View file

@ -88,12 +88,11 @@ static int pdo_odbc_utf82ucs2(pdo_stmt_t *stmt, int is_unicode, const char *buf,
return PDO_ODBC_CONV_NOT_REQUIRED; return PDO_ODBC_CONV_NOT_REQUIRED;
} }
static int pdo_odbc_ucs22utf8(pdo_stmt_t *stmt, int is_unicode, zval *result) static int pdo_odbc_ucs22utf8(int is_unicode, zval *result)
{ {
#ifdef PHP_WIN32 #ifdef PHP_WIN32
ZEND_ASSERT(Z_TYPE_P(result) == IS_STRING); ZEND_ASSERT(Z_TYPE_P(result) == IS_STRING);
if (is_unicode && Z_STRLEN_P(result) != 0) { if (is_unicode && Z_STRLEN_P(result) != 0) {
pdo_odbc_stmt *S = (pdo_odbc_stmt*)stmt->driver_data;
DWORD ret; DWORD ret;
ret = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR) Z_STRVAL_P(result), Z_STRLEN_P(result)/sizeof(WCHAR), NULL, 0, NULL, NULL); ret = WideCharToMultiByte(CP_UTF8, 0, (LPCWSTR) Z_STRVAL_P(result), Z_STRLEN_P(result)/sizeof(WCHAR), NULL, 0, NULL, NULL);
@ -502,7 +501,7 @@ static int odbc_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *p
if (P->len >= 0) { if (P->len >= 0) {
ZVAL_STRINGL(parameter, P->outbuf, P->len); ZVAL_STRINGL(parameter, P->outbuf, P->len);
switch (pdo_odbc_ucs22utf8(stmt, P->is_unicode, parameter)) { switch (pdo_odbc_ucs22utf8(P->is_unicode, parameter)) {
case PDO_ODBC_CONV_FAIL: case PDO_ODBC_CONV_FAIL:
/* something fishy, but allow it to come back as binary */ /* something fishy, but allow it to come back as binary */
case PDO_ODBC_CONV_NOT_REQUIRED: case PDO_ODBC_CONV_NOT_REQUIRED:
@ -751,7 +750,7 @@ in_data:
} }
unicode_conv: unicode_conv:
switch (pdo_odbc_ucs22utf8(stmt, C->is_unicode, result)) { switch (pdo_odbc_ucs22utf8(C->is_unicode, result)) {
case PDO_ODBC_CONV_FAIL: case PDO_ODBC_CONV_FAIL:
/* oh well. They can have the binary version of it */ /* oh well. They can have the binary version of it */
case PDO_ODBC_CONV_NOT_REQUIRED: case PDO_ODBC_CONV_NOT_REQUIRED:

1
sapi/phpdbg/phpdbg_win.c
View file

@ -26,7 +26,6 @@ int mprotect(void *addr, size_t size, int protection) {
int phpdbg_exception_handler_win32(EXCEPTION_POINTERS *xp) { int phpdbg_exception_handler_win32(EXCEPTION_POINTERS *xp) {
EXCEPTION_RECORD *xr = xp->ExceptionRecord; EXCEPTION_RECORD *xr = xp->ExceptionRecord;
CONTEXT *xc = xp->ContextRecord;
switch (xr->ExceptionCode) { switch (xr->ExceptionCode) {
case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ACCESS_VIOLATION: