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
463cacb9
Commit
463cacb9
authored
Apr 18, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove warnings about missing DBUG_RETURN's
parent
838c7ddc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
9 deletions
+15
-9
storage/ndb/src/mgmapi/mgmapi.cpp
storage/ndb/src/mgmapi/mgmapi.cpp
+15
-9
No files found.
storage/ndb/src/mgmapi/mgmapi.cpp
View file @
463cacb9
...
...
@@ -138,6 +138,12 @@ setError(NdbMgmHandle h, int error, int error_line, const char * msg, ...){
return ret; \
}
#define DBUG_CHECK_REPLY(reply, ret) \
if (reply == NULL) { \
SET_ERROR(handle, NDB_MGM_ILLEGAL_SERVER_REPLY, ""); \
DBUG_RETURN(ret); \
}
/*****************************************************************************
* Handles
*****************************************************************************/
...
...
@@ -2171,9 +2177,9 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
int
param
,
int
value
,
struct
ndb_mgm_reply
*
mgmreply
){
DBUG_ENTER
(
"ndb_mgm_set_connection_int_parameter"
);
CHECK_HANDLE
(
handle
,
0
);
CHECK_CONNECTED
(
handle
,
0
);
DBUG_ENTER
(
"ndb_mgm_set_connection_int_parameter"
);
Properties
args
;
args
.
put
(
"node1"
,
node1
);
...
...
@@ -2190,7 +2196,7 @@ ndb_mgm_set_connection_int_parameter(NdbMgmHandle handle,
const
Properties
*
prop
;
prop
=
ndb_mgm_call
(
handle
,
reply
,
"set connection parameter"
,
&
args
);
CHECK_REPLY
(
prop
,
-
1
);
DBUG_
CHECK_REPLY
(
prop
,
-
1
);
int
res
=
-
1
;
do
{
...
...
@@ -2214,9 +2220,9 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
int
param
,
int
*
value
,
struct
ndb_mgm_reply
*
mgmreply
){
DBUG_ENTER
(
"ndb_mgm_get_connection_int_parameter"
);
CHECK_HANDLE
(
handle
,
-
1
);
CHECK_CONNECTED
(
handle
,
-
2
);
DBUG_ENTER
(
"ndb_mgm_get_connection_int_parameter"
);
Properties
args
;
args
.
put
(
"node1"
,
node1
);
...
...
@@ -2232,7 +2238,7 @@ ndb_mgm_get_connection_int_parameter(NdbMgmHandle handle,
const
Properties
*
prop
;
prop
=
ndb_mgm_call
(
handle
,
reply
,
"get connection parameter"
,
&
args
);
CHECK_REPLY
(
prop
,
-
3
);
DBUG_
CHECK_REPLY
(
prop
,
-
3
);
int
res
=
-
1
;
do
{
...
...
@@ -2280,9 +2286,9 @@ ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle)
{
Uint32
nodeid
=
0
;
DBUG_ENTER
(
"ndb_mgm_get_mgmd_nodeid"
);
CHECK_HANDLE
(
handle
,
0
);
CHECK_CONNECTED
(
handle
,
0
);
DBUG_ENTER
(
"ndb_mgm_get_mgmd_nodeid"
);
Properties
args
;
...
...
@@ -2294,7 +2300,7 @@ ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle)
const
Properties
*
prop
;
prop
=
ndb_mgm_call
(
handle
,
reply
,
"get mgmd nodeid"
,
&
args
);
CHECK_REPLY
(
prop
,
0
);
DBUG_
CHECK_REPLY
(
prop
,
0
);
if
(
!
prop
->
get
(
"nodeid"
,
&
nodeid
)){
fprintf
(
handle
->
errstream
,
"Unable to get value
\n
"
);
...
...
@@ -2308,9 +2314,9 @@ ndb_mgm_get_mgmd_nodeid(NdbMgmHandle handle)
extern
"C"
int
ndb_mgm_report_event
(
NdbMgmHandle
handle
,
Uint32
*
data
,
Uint32
length
)
{
DBUG_ENTER
(
"ndb_mgm_report_event"
);
CHECK_HANDLE
(
handle
,
0
);
CHECK_CONNECTED
(
handle
,
0
);
DBUG_ENTER
(
"ndb_mgm_report_event"
);
Properties
args
;
args
.
put
(
"length"
,
length
);
...
...
@@ -2329,7 +2335,7 @@ int ndb_mgm_report_event(NdbMgmHandle handle, Uint32 *data, Uint32 length)
const
Properties
*
prop
;
prop
=
ndb_mgm_call
(
handle
,
reply
,
"report event"
,
&
args
);
CHECK_REPLY
(
prop
,
-
1
);
DBUG_
CHECK_REPLY
(
prop
,
-
1
);
DBUG_RETURN
(
0
);
}
...
...
@@ -2337,9 +2343,9 @@ int ndb_mgm_report_event(NdbMgmHandle handle, Uint32 *data, Uint32 length)
extern
"C"
int
ndb_mgm_end_session
(
NdbMgmHandle
handle
)
{
DBUG_ENTER
(
"ndb_mgm_end_session"
);
CHECK_HANDLE
(
handle
,
0
);
CHECK_CONNECTED
(
handle
,
0
);
DBUG_ENTER
(
"ndb_mgm_end_session"
);
SocketOutputStream
s_output
(
handle
->
socket
);
s_output
.
println
(
"end session"
);
...
...
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