diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-21 12:51:24 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-03-21 12:52:07 +0200 |
| commit | de9072ca19b84e0a33425248b7d4557c3e5ae89b (patch) | |
| tree | d43c9bc58d04529b7019dc9937ee3ccc72e8118c /storage | |
| parent | 45973ec61058b1428ae88316631f49e58d227207 (diff) | |
| download | mariadb-git-de9072ca19b84e0a33425248b7d4557c3e5ae89b.tar.gz | |
Connect: Remove some unused variables
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/connect/jdbconn.cpp | 1 | ||||
| -rw-r--r-- | storage/connect/tabrest.cpp | 3 | ||||
| -rw-r--r-- | storage/connect/tabrest.h | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/storage/connect/jdbconn.cpp b/storage/connect/jdbconn.cpp index 2cb75e0adc1..2dab385a36f 100644 --- a/storage/connect/jdbconn.cpp +++ b/storage/connect/jdbconn.cpp @@ -766,7 +766,6 @@ void JDBConn::AddJars(PSTRG jpop, char sep) /***********************************************************************/ bool JDBConn::Connect(PJPARM sop) { - int irc = RC_FX; bool err = false; jint rc; jboolean jt = (trace(1)); diff --git a/storage/connect/tabrest.cpp b/storage/connect/tabrest.cpp index 9c6b724973f..3ef2a460b9d 100644 --- a/storage/connect/tabrest.cpp +++ b/storage/connect/tabrest.cpp @@ -167,8 +167,7 @@ PQRYRES __stdcall ColREST(PGLOBAL g, PTOS tp, char *tab, char *db, bool info) #endif // !MARIADB // We used the file name relative to recorded datapath - strcat(strcat(strcat(strcpy(filename, "."), slash), db), slash); - strncat(filename, fn, _MAX_PATH - strlen(filename)); + snprintf(filename, sizeof filename, IF_WIN(".\\%s\\%s","./%s/%s"), db, fn); // Retrieve the file from the web and copy it locally if (http && grf(g->Message, trace(515), http, uri, filename)) { diff --git a/storage/connect/tabrest.h b/storage/connect/tabrest.h index 9cf2d10a6b8..f08ac7984c9 100644 --- a/storage/connect/tabrest.h +++ b/storage/connect/tabrest.h @@ -5,10 +5,7 @@ /***********************************************************************/ #pragma once -#if defined(__WIN__) -static PCSZ slash = "\\"; -#else // !__WIN__ -static PCSZ slash = "/"; +#ifndef __WIN__ #define stricmp strcasecmp #endif // !__WIN__ |