@@ -88,12 +88,11 @@ static int pdo_odbc_utf82ucs2(pdo_stmt_t *stmt, int is_unicode, const char *buf,
8888 return PDO_ODBC_CONV_NOT_REQUIRED ;
8989}
9090
91- static int pdo_odbc_ucs22utf8 (pdo_stmt_t * stmt , int is_unicode , zval * result )
91+ static int pdo_odbc_ucs22utf8 (int is_unicode , zval * result )
9292{
9393#ifdef PHP_WIN32
9494 ZEND_ASSERT (Z_TYPE_P (result ) == IS_STRING );
9595 if (is_unicode && Z_STRLEN_P (result ) != 0 ) {
96- pdo_odbc_stmt * S = (pdo_odbc_stmt * )stmt -> driver_data ;
9796 DWORD ret ;
9897
9998 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
502501
503502 if (P -> len >= 0 ) {
504503 ZVAL_STRINGL (parameter , P -> outbuf , P -> len );
505- switch (pdo_odbc_ucs22utf8 (stmt , P -> is_unicode , parameter )) {
504+ switch (pdo_odbc_ucs22utf8 (P -> is_unicode , parameter )) {
506505 case PDO_ODBC_CONV_FAIL :
507506 /* something fishy, but allow it to come back as binary */
508507 case PDO_ODBC_CONV_NOT_REQUIRED :
@@ -751,7 +750,7 @@ static int odbc_stmt_get_col(pdo_stmt_t *stmt, int colno, zval *result, enum pdo
751750 }
752751
753752unicode_conv :
754- switch (pdo_odbc_ucs22utf8 (stmt , C -> is_unicode , result )) {
753+ switch (pdo_odbc_ucs22utf8 (C -> is_unicode , result )) {
755754 case PDO_ODBC_CONV_FAIL :
756755 /* oh well. They can have the binary version of it */
757756 case PDO_ODBC_CONV_NOT_REQUIRED :
0 commit comments