Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
de9072ca
Commit
de9072ca
authored
Mar 21, 2020
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Connect: Remove some unused variables
parent
45973ec6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
7 deletions
+2
-7
storage/connect/jdbconn.cpp
storage/connect/jdbconn.cpp
+0
-1
storage/connect/tabrest.cpp
storage/connect/tabrest.cpp
+1
-2
storage/connect/tabrest.h
storage/connect/tabrest.h
+1
-4
No files found.
storage/connect/jdbconn.cpp
View file @
de9072ca
...
@@ -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
));
...
...
storage/connect/tabrest.cpp
View file @
de9072ca
...
@@ -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
))
{
...
...
storage/connect/tabrest.h
View file @
de9072ca
...
@@ -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__
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment