lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-19 18:47:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improved ODBC error messages

Browse Source
This commit is contained in:
Evan Miller
2020-08-10 16:57:43 -04:00
parent 3c7761f965
commit cc292b3f0d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/odbc/odbc.c
View File

@@ -175,13 +175,15 @@ static int sqlwlen(SQLWCHAR *p){
See _SQLExecute for details. See _SQLExecute for details.
*/ */
static void LogError (const char* error) static void LogError (const char* format, ...)
{ {
/* /*
* Someday, I might make this store more than one error. * Someday, I might make this store more than one error.
*/ */
strncpy (lastError, error, _MAX_ERROR_LEN); va_list argp;
lastError[_MAX_ERROR_LEN] = '\0'; /* in case we had a long message */ va_start(argp, format);
vsnprintf(lastError, _MAX_ERROR_LEN, format, argp);
va_end(argp);
} }
static SQLRETURN do_connect ( static SQLRETURN do_connect (
@@ -223,7 +225,7 @@ static SQLRETURN SQL_API _SQLDriverConnect(
} }
SetConnectString (params, (gchar*)szConnStrIn); SetConnectString (params, (gchar*)szConnStrIn);
if (!(database = GetConnectParam (params, "Database"))){ if (!(database = GetConnectParam (params, "Database"))){
LogError ("Could not find Database parameter"); LogError ("Could not find Database parameter in '%s'", szConnStrIn);
return SQL_ERROR; return SQL_ERROR;
} }
ret = do_connect (hdbc, database); ret = do_connect (hdbc, database);
@@ -233,7 +235,7 @@ static SQLRETURN SQL_API _SQLDriverConnect(
ret = do_connect (hdbc, database); ret = do_connect (hdbc, database);
return ret; return ret;
} }
LogError ("Could not find DSN nor DBQ in connect string"); LogError ("Could not find DSN nor DBQ in connect string '%s'", szConnStrIn);
return SQL_ERROR; return SQL_ERROR;
} }
@@ -688,7 +690,7 @@ static SQLRETURN SQL_API _SQLConnect(
} }
else if (!(database = GetConnectParam (params, "Database"))) else if (!(database = GetConnectParam (params, "Database")))
{ {
LogError ("Could not find Database parameter"); LogError ("Could not find Database parameter in '%s'", szDSN);
return SQL_ERROR; return SQL_ERROR;
} }