From 6b2aa39e19e8671101d578ea68d48cae57be897c Mon Sep 17 00:00:00 2001 From: v-kaywon Date: Thu, 23 Mar 2017 10:21:48 -0700 Subject: [PATCH 1/3] convert const char[] to char[] to avoid conversion warnings --- source/sqlsrv/init.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/sqlsrv/init.cpp b/source/sqlsrv/init.cpp index 65f91860..97c6f4be 100644 --- a/source/sqlsrv/init.cpp +++ b/source/sqlsrv/init.cpp @@ -636,7 +636,14 @@ PHP_RINIT_FUNCTION(sqlsrv) LOG_FUNCTION( "PHP_RINIT for php_sqlsrv" ); // read INI settings - SQLSRV_G( warnings_return_as_errors ) = INI_BOOL( INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS ); + // need to convert const char[] to char[] to avoid converting string to char* warnings + // cannot simply cast const char[] to char* since INI_INT needs the sizeof(param) and the size of char* is always 4 / 8 bytes + char warnings_as_errors[] = INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS; + char severity[] = INI_PREFIX INI_LOG_SEVERITY; + char subsystems[] = INI_PREFIX INI_LOG_SUBSYSTEMS; + char buffered_limit[] = INI_PREFIX INI_BUFFERED_QUERY_LIMIT; + + SQLSRV_G( warnings_return_as_errors ) = INI_BOOL( INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS ); SQLSRV_G( log_severity ) = INI_INT( INI_PREFIX INI_LOG_SEVERITY ); SQLSRV_G( log_subsystems ) = INI_INT( INI_PREFIX INI_LOG_SUBSYSTEMS ); SQLSRV_G( buffered_query_limit ) = INI_INT( INI_PREFIX INI_BUFFERED_QUERY_LIMIT ); From b4f7684db3c38374d8772adac88202430aa09cfe Mon Sep 17 00:00:00 2001 From: v-kaywon Date: Thu, 23 Mar 2017 10:57:35 -0700 Subject: [PATCH 2/3] Update init.cpp fix indentation --- source/sqlsrv/init.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/sqlsrv/init.cpp b/source/sqlsrv/init.cpp index 97c6f4be..412cab3c 100644 --- a/source/sqlsrv/init.cpp +++ b/source/sqlsrv/init.cpp @@ -636,14 +636,14 @@ PHP_RINIT_FUNCTION(sqlsrv) LOG_FUNCTION( "PHP_RINIT for php_sqlsrv" ); // read INI settings - // need to convert const char[] to char[] to avoid converting string to char* warnings - // cannot simply cast const char[] to char* since INI_INT needs the sizeof(param) and the size of char* is always 4 / 8 bytes - char warnings_as_errors[] = INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS; - char severity[] = INI_PREFIX INI_LOG_SEVERITY; - char subsystems[] = INI_PREFIX INI_LOG_SUBSYSTEMS; - char buffered_limit[] = INI_PREFIX INI_BUFFERED_QUERY_LIMIT; + // need to convert const char[] to char[] to avoid converting string to char* warnings + // cannot simply cast const char[] to char* since INI_INT needs the sizeof(param) and the size of char* is always 4 / 8 bytes + char warnings_as_errors[] = INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS; + char severity[] = INI_PREFIX INI_LOG_SEVERITY; + char subsystems[] = INI_PREFIX INI_LOG_SUBSYSTEMS; + char buffered_limit[] = INI_PREFIX INI_BUFFERED_QUERY_LIMIT; - SQLSRV_G( warnings_return_as_errors ) = INI_BOOL( INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS ); + SQLSRV_G( warnings_return_as_errors ) = INI_BOOL( INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS ); SQLSRV_G( log_severity ) = INI_INT( INI_PREFIX INI_LOG_SEVERITY ); SQLSRV_G( log_subsystems ) = INI_INT( INI_PREFIX INI_LOG_SUBSYSTEMS ); SQLSRV_G( buffered_query_limit ) = INI_INT( INI_PREFIX INI_BUFFERED_QUERY_LIMIT ); From 9f3c0cee54f17ec4d67bd66a12a44f46db718314 Mon Sep 17 00:00:00 2001 From: v-kaywon Date: Thu, 23 Mar 2017 11:55:33 -0700 Subject: [PATCH 3/3] Update init.cpp --- source/sqlsrv/init.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/sqlsrv/init.cpp b/source/sqlsrv/init.cpp index 412cab3c..1e8e8bc2 100644 --- a/source/sqlsrv/init.cpp +++ b/source/sqlsrv/init.cpp @@ -643,10 +643,10 @@ PHP_RINIT_FUNCTION(sqlsrv) char subsystems[] = INI_PREFIX INI_LOG_SUBSYSTEMS; char buffered_limit[] = INI_PREFIX INI_BUFFERED_QUERY_LIMIT; - SQLSRV_G( warnings_return_as_errors ) = INI_BOOL( INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS ); - SQLSRV_G( log_severity ) = INI_INT( INI_PREFIX INI_LOG_SEVERITY ); - SQLSRV_G( log_subsystems ) = INI_INT( INI_PREFIX INI_LOG_SUBSYSTEMS ); - SQLSRV_G( buffered_query_limit ) = INI_INT( INI_PREFIX INI_BUFFERED_QUERY_LIMIT ); + SQLSRV_G( warnings_return_as_errors ) = INI_BOOL( warnings_as_errors ); + SQLSRV_G( log_severity ) = INI_INT( severity ); + SQLSRV_G( log_subsystems ) = INI_INT( subsystems ); + SQLSRV_G( buffered_query_limit ) = INI_INT( buffered_limit ); LOG( SEV_NOTICE, INI_PREFIX INI_WARNINGS_RETURN_AS_ERRORS " = %1!s!", SQLSRV_G( warnings_return_as_errors ) ? "On" : "Off"); LOG( SEV_NOTICE, INI_PREFIX INI_LOG_SEVERITY " = %1!d!", SQLSRV_G( log_severity ));