work on co-pilot comments

Author: alinaliBQ

cpp/src/arrow/flight/sql/odbc/odbc_impl/encoding_utils.h

@@ -34,14 +34,12 @@
 #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
 
 #ifdef __linux__
-#  define GET_SQWCHAR_PTR(wstring_var) (ODBC::ToSqlWCharVector(wstring_var).data())
+#  define ODBC_INI reinterpret_cast<LPCWSTR>(u"ODBC.INI")
 #else
 // Windows and macOS
-#  define GET_SQWCHAR_PTR(wstring_var) (wstring_var.c_str())
+#  define ODBC_INI reinterpret_cast<LPCWSTR>(L"ODBC.INI")
 #endif
 
-#define ODBC_INI reinterpret_cast<LPCWSTR>(GET_SQWCHAR_PTR(std::wstring(L"ODBC.INI")))
-
 namespace ODBC {
 
 // Return the number of bytes required for the conversion.

cpp/src/arrow/flight/sql/odbc/odbc_impl/system_dsn.cc

@@ -59,10 +59,10 @@ void PostError(DWORD error_code, LPWSTR error_msg) {
 
 void PostArrowUtilError(arrow::Status error_status) {
   std::string error_msg = error_status.message();
-  std::wstring werror_msg = arrow::util::UTF8ToWideString(error_msg).ValueOr(
-      L"Error during utf8 to wide string conversion");
+  CONVERT_SQLWCHAR_STR(werror_msg, error_msg);
 
-  PostError(ODBC_ERROR_GENERAL_ERR, const_cast<LPWSTR>(GET_SQWCHAR_PTR(werror_msg)));
+  PostError(ODBC_ERROR_GENERAL_ERR,
+            const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(werror_msg.c_str())));
 }
 
 void PostLastInstallerError() {
@@ -94,7 +94,14 @@ void PostLastInstallerError() {
  * @return True on success and false on fail.
  */
 bool UnregisterDsn(const std::wstring& dsn) {
-  if (SQLRemoveDSNFromIni(GET_SQWCHAR_PTR(dsn))) {
+#ifdef __linux__
+  auto dsn_vec = ODBC::ToSqlWCharVector(dsn);
+  const SQLWCHAR* dsn_arr = dsn_vec.data();
+#else
+  // Windows and macOS
+  const SQLWCHAR* dsn_arr = dsn.c_str();
+#endif
+  if (SQLRemoveDSNFromIni(dsn_arr)) {
     return true;
   }