Skip to content

Commit f5f5d5e

Browse files
committed
add more annotations
1 parent 3ecc505 commit f5f5d5e

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

source/pdo_sqlsrv/pdo_stmt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1311,7 +1311,7 @@ int pdo_sqlsrv_stmt_param_hook( _Inout_ pdo_stmt_t *stmt,
13111311

13121312

13131313
// Returns a sqlsrv_phptype for a given SQL Server data type.
1314-
sqlsrv_phptype pdo_sqlsrv_stmt::sql_type_to_php_type( _In_ SQLINTEGER sql_type, SQLUINTEGER size, bool prefer_string_over_stream )
1314+
sqlsrv_phptype pdo_sqlsrv_stmt::sql_type_to_php_type( _In_ SQLINTEGER sql_type, _In_ SQLUINTEGER size, _In_ bool prefer_string_over_stream )
13151315
{
13161316
sqlsrv_phptype sqlsrv_phptype;
13171317
int local_encoding = this->encoding();

source/pdo_sqlsrv/php_pdo_sqlsrv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ struct pdo_sqlsrv_stmt : public sqlsrv_stmt {
264264

265265
// driver specific conversion rules from a SQL Server/ODBC type to one of the SQLSRV_PHPTYPE_* constants
266266
// for PDO, everything is a string, so we return SQLSRV_PHPTYPE_STRING for all SQL types
267-
virtual sqlsrv_phptype sql_type_to_php_type( _In_ SQLINTEGER sql_type, SQLUINTEGER size, bool prefer_string_to_stream );
267+
virtual sqlsrv_phptype sql_type_to_php_type( _In_ SQLINTEGER sql_type, _In_ SQLUINTEGER size, _In_ bool prefer_string_to_stream );
268268

269269
bool direct_query; // flag set if the query should be executed directly or prepared
270270
const char* direct_query_subst_string; // if the query is direct, hold the substitution string if using named parameters

source/shared/core_conn.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ void core_sqlsrv_get_client_info( _Inout_ sqlsrv_conn* conn, _Out_ zval *client_
527527
// Properly escaped means that any '}' should be escaped by a prior '}'. It is assumed that
528528
// the value will be surrounded by { and } by the caller after it has been validated
529529

530-
bool core_is_conn_opt_value_escaped( _In_ const char* value, _Inout_ size_t value_len )
530+
bool core_is_conn_opt_value_escaped( _Inout_ const char* value, _Inout_ size_t value_len )
531531
{
532532
// if the value is already quoted, then only analyse the part inside the quotes and return it as
533533
// unquoted since we quote it when adding it to the connection string.

source/shared/core_sqlsrv.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,7 @@ void core_sqlsrv_rollback( _Inout_ sqlsrv_conn* conn TSRMLS_DC );
11991199
void core_sqlsrv_get_server_info( _Inout_ sqlsrv_conn* conn, _Out_ zval* server_info TSRMLS_DC );
12001200
void core_sqlsrv_get_server_version( _Inout_ sqlsrv_conn* conn, _Inout_ zval *server_version TSRMLS_DC );
12011201
void core_sqlsrv_get_client_info( _Inout_ sqlsrv_conn* conn, _Out_ zval *client_info TSRMLS_DC );
1202-
bool core_is_conn_opt_value_escaped( _In_ const char* value, _Inout_ size_t value_len );
1202+
bool core_is_conn_opt_value_escaped( _Inout_ const char* value, _Inout_ size_t value_len );
12031203
size_t core_str_zval_is_true( _Inout_ zval* str_zval );
12041204
bool core_is_authentication_option_valid( _In_z_ const char* value, _In_ size_t value_len );
12051205

@@ -1902,7 +1902,7 @@ namespace core {
19021902
}
19031903
}
19041904

1905-
inline void SQLDescribeCol( sqlsrv_stmt* stmt, SQLSMALLINT colno, _Out_writes_opt_(col_name_length) SQLCHAR* col_name, SQLSMALLINT col_name_length,
1905+
inline void SQLDescribeCol( _Inout_ sqlsrv_stmt* stmt, _In_ SQLSMALLINT colno, _Out_writes_opt_(col_name_length) SQLCHAR* col_name, _In_ SQLSMALLINT col_name_length,
19061906
_Out_opt_ SQLSMALLINT* col_name_length_out, _Out_opt_ SQLSMALLINT* data_type, _Out_opt_ SQLULEN* col_size,
19071907
_Out_opt_ SQLSMALLINT* decimal_digits, _Out_opt_ SQLSMALLINT* nullable TSRMLS_DC )
19081908
{

source/sqlsrv/conn.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ void validate_stmt_options( _Inout_ sqlsrv_context& ctx, _Inout_ zval* stmt_opti
154154
void add_conn_option_key( _Inout_ sqlsrv_context& ctx, _In_ zend_string* key, _In_ size_t key_len,
155155
_Inout_ HashTable* options_ht, _Inout_ zval* data TSRMLS_DC );
156156
void add_stmt_option_key( _Inout_ sqlsrv_context& ctx, _In_ zend_string* key, _In_ size_t key_len, _Inout_ HashTable* options_ht, _Inout_ zval* data TSRMLS_DC );
157-
int get_conn_option_key( _Inout_ sqlsrv_context& ctx, _In_ zend_string* key, _In_ size_t key_len, _In_ zval const* value_z TSRMLS_DC );
157+
int get_conn_option_key( _Inout_ sqlsrv_context& ctx, _In_ zend_string* key, _In_ size_t key_len, _Inout_ zval const* value_z TSRMLS_DC );
158158
int get_stmt_option_key( _In_ zend_string* key, _In_ size_t key_len TSRMLS_DC );
159159

160160
}
@@ -1189,7 +1189,7 @@ void sqlsrv_conn_close_stmts( _Inout_ ss_sqlsrv_conn* conn TSRMLS_DC )
11891189
conn->stmts = NULL;
11901190
}
11911191

1192-
int get_conn_option_key( _Inout_ sqlsrv_context& ctx, _In_ zend_string* key, _In_ size_t key_len, _In_ zval const* value_z TSRMLS_DC )
1192+
int get_conn_option_key( _Inout_ sqlsrv_context& ctx, _In_ zend_string* key, _In_ size_t key_len, _Inout_ zval const* value_z TSRMLS_DC )
11931193
{
11941194
for( int i=0; SS_CONN_OPTS[ i ].conn_option_key != SQLSRV_CONN_OPTION_INVALID; ++i )
11951195
{

0 commit comments

Comments
 (0)