Commit de9072ca authored by Marko Mäkelä's avatar Marko Mäkelä

Connect: Remove some unused variables

parent 45973ec6
...@@ -766,7 +766,6 @@ void JDBConn::AddJars(PSTRG jpop, char sep) ...@@ -766,7 +766,6 @@ void JDBConn::AddJars(PSTRG jpop, char sep)
/***********************************************************************/ /***********************************************************************/
bool JDBConn::Connect(PJPARM sop) bool JDBConn::Connect(PJPARM sop)
{ {
int irc = RC_FX;
bool err = false; bool err = false;
jint rc; jint rc;
jboolean jt = (trace(1)); jboolean jt = (trace(1));
......
...@@ -167,8 +167,7 @@ PQRYRES __stdcall ColREST(PGLOBAL g, PTOS tp, char *tab, char *db, bool info) ...@@ -167,8 +167,7 @@ PQRYRES __stdcall ColREST(PGLOBAL g, PTOS tp, char *tab, char *db, bool info)
#endif // !MARIADB #endif // !MARIADB
// We used the file name relative to recorded datapath // We used the file name relative to recorded datapath
strcat(strcat(strcat(strcpy(filename, "."), slash), db), slash); snprintf(filename, sizeof filename, IF_WIN(".\\%s\\%s","./%s/%s"), db, fn);
strncat(filename, fn, _MAX_PATH - strlen(filename));
// Retrieve the file from the web and copy it locally // Retrieve the file from the web and copy it locally
if (http && grf(g->Message, trace(515), http, uri, filename)) { if (http && grf(g->Message, trace(515), http, uri, filename)) {
......
...@@ -5,10 +5,7 @@ ...@@ -5,10 +5,7 @@
/***********************************************************************/ /***********************************************************************/
#pragma once #pragma once
#if defined(__WIN__) #ifndef __WIN__
static PCSZ slash = "\\";
#else // !__WIN__
static PCSZ slash = "/";
#define stricmp strcasecmp #define stricmp strcasecmp
#endif // !__WIN__ #endif // !__WIN__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment