dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

removed unused function (#383)

Browse source
This commit is contained in:
Hadis Kakanejadi Fard 2017-05-04 18:15:39 -07:00 committed by ulvii
parent ce6337709b
commit 4922e97b5d
3 changed files with 0 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/sqlsrv/conn.cpp
View file

@ -937,7 +937,6 @@ PHP_FUNCTION( sqlsrv_prepare )
core_sqlsrv_prepare( stmt, sql, sql_len TSRMLS_CC );
//mark_params_by_reference( stmt, params_z TSRMLS_CC );
if (params_z) {
stmt->params_z = (zval *)sqlsrv_malloc(sizeof(zval));
ZVAL_COPY(stmt->params_z, params_z);

1
source/sqlsrv/php_sqlsrv.h
View file

@ -227,7 +227,6 @@ void __cdecl sqlsrv_stmt_dtor( zend_resource *rsrc TSRMLS_DC );
// "internal" statement functions shared by functions in conn.cpp and stmt.cpp
void bind_params( ss_sqlsrv_stmt* stmt TSRMLS_DC );
void mark_params_by_reference( ss_sqlsrv_stmt* stmt, zval* params_z TSRMLS_DC );
bool sqlsrv_stmt_common_execute( sqlsrv_stmt* s, const SQLCHAR* sql_string, int sql_len, bool direct, const char* function
TSRMLS_DC );
void free_odbc_resources( ss_sqlsrv_stmt* stmt TSRMLS_DC );

52
source/sqlsrv/stmt.cpp
View file

@ -1168,58 +1168,6 @@ PHP_FUNCTION(SQLSRV_SQLTYPE_VARCHAR)
type_and_size_calc( INTERNAL_FUNCTION_PARAM_PASSTHRU, SQL_VARCHAR );
}
// mark parameters passed into sqlsrv_prepare as reference parameters so that they may be updated later in the
// script and subsequent sqlsrv_execute calls will use the new values. Marking them as references "pins" them
// to their memory location so that the buffer we give to ODBC can be relied on to be there.
void mark_params_by_reference( ss_sqlsrv_stmt* stmt, zval* params_z TSRMLS_DC )
{
SQLSRV_ASSERT( stmt->params_z == NULL, "mark_params_by_reference: parameters list shouldn't be present" );
if( params_z == NULL ) {
return;
}
HashTable* params_ht = Z_ARRVAL_P( params_z );
zend_ulong index;
zend_string* key = NULL;
zval* value_z = NULL;
ZEND_HASH_FOREACH_KEY_VAL( params_ht, index, key, value_z ) {
// make sure it's an integer index
int type = key ? HASH_KEY_IS_STRING : HASH_KEY_IS_LONG;
CHECK_CUSTOM_ERROR( type != HASH_KEY_IS_LONG, stmt, SS_SQLSRV_ERROR_PARAM_INVALID_INDEX ) {
throw ss::SSException();
}
// This code turns parameters into references. Since the function declaration cannot
// pass array elements as references (without requiring & in front of each variable),
// we have to set the reference in each of the zvals ourselves. In the event of a
// parameter array (or sub array if you will) being passed in, we set the zval of the
// parameter array's first element.
// if it's a sole variable
if ( Z_TYPE_P( value_z ) != IS_ARRAY ) {
ZVAL_MAKE_REF( value_z );
}
else {
zval* var = NULL;
int zr = ( NULL != ( var = zend_hash_index_find( Z_ARRVAL_P( value_z ), 0 ))) ? SUCCESS : FAILURE;
CHECK_CUSTOM_ERROR( zr == FAILURE, stmt, SS_SQLSRV_ERROR_VAR_REQUIRED, index + 1 ) {
throw ss::SSException();
}
ZVAL_MAKE_REF( var );
}
} ZEND_HASH_FOREACH_END();
// save our parameters for later.
Z_TRY_ADDREF_P( params_z );
stmt->params_z = params_z;
}
void bind_params( ss_sqlsrv_stmt* stmt TSRMLS_DC )
{
// if there's nothing to do, just return