Skip to content
This repository has been archived by the owner on Aug 25, 2018. It is now read-only.

Remove unused output connection string from SQLDriverConnect call #188

Merged
merged 1 commit into from Jun 20, 2016
Merged

Remove unused output connection string from SQLDriverConnect call #188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/nanodbc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,17 +849,15 @@ class connection::connection_impl
enable_async(event_handle);
#endif

NANODBC_SQLCHAR dsn[1024];
SQLSMALLINT dsn_size = 0;
NANODBC_CALL_RC(
NANODBC_FUNC(SQLDriverConnect)
, rc
, conn_
, 0
, (NANODBC_SQLCHAR*)connection_string.c_str(), SQL_NTS
, dsn
, sizeof(dsn) / sizeof(NANODBC_SQLCHAR)
, &dsn_size
, NULL
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NULL should read nullptr

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NULL should read nullptr

There's quite a few instances of NULL instead of nullptr across the codebase (probably most of them from me, sorry about that). Do you mind if I leave this as-is for now and correct them all in a separate PR?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, thanks.

, 0
, NULL
, SQL_DRIVER_NOPROMPT);
if(!success(rc) && (event_handle == NULL || rc != SQL_STILL_EXECUTING))
NANODBC_THROW_DATABASE_ERROR(conn_, SQL_HANDLE_DBC);
Expand Down