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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
6d836324
Commit
6d836324
authored
Oct 11, 2004
by
tomas@poseidon.ndb.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
converted to use my_malloc for memory allocation
parent
f05a92ce
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
14 deletions
+15
-14
ndb/src/mgmapi/mgmapi.cpp
ndb/src/mgmapi/mgmapi.cpp
+15
-14
No files found.
ndb/src/mgmapi/mgmapi.cpp
View file @
6d836324
...
@@ -15,6 +15,9 @@
...
@@ -15,6 +15,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include <ndb_global.h>
#include <ndb_global.h>
#include <my_sys.h>
#include <NdbAutoPtr.hpp>
#include <NdbTCP.h>
#include <NdbTCP.h>
#include "mgmapi.h"
#include "mgmapi.h"
...
@@ -137,7 +140,8 @@ extern "C"
...
@@ -137,7 +140,8 @@ extern "C"
NdbMgmHandle
NdbMgmHandle
ndb_mgm_create_handle
()
ndb_mgm_create_handle
()
{
{
NdbMgmHandle
h
=
(
NdbMgmHandle
)
malloc
(
sizeof
(
ndb_mgm_handle
));
NdbMgmHandle
h
=
(
NdbMgmHandle
)
my_malloc
(
sizeof
(
ndb_mgm_handle
),
MYF
(
MY_WME
));
h
->
connected
=
0
;
h
->
connected
=
0
;
h
->
last_error
=
0
;
h
->
last_error
=
0
;
h
->
last_error_line
=
0
;
h
->
last_error_line
=
0
;
...
@@ -166,16 +170,14 @@ ndb_mgm_destroy_handle(NdbMgmHandle * handle)
...
@@ -166,16 +170,14 @@ ndb_mgm_destroy_handle(NdbMgmHandle * handle)
if
((
*
handle
)
->
connected
){
if
((
*
handle
)
->
connected
){
ndb_mgm_disconnect
(
*
handle
);
ndb_mgm_disconnect
(
*
handle
);
}
}
if
((
*
handle
)
->
hostname
!=
0
){
my_free
((
*
handle
)
->
hostname
,
MYF
(
MY_ALLOW_ZERO_PTR
));
free
((
*
handle
)
->
hostname
);
}
#ifdef MGMAPI_LOG
#ifdef MGMAPI_LOG
if
((
*
handle
)
->
logfile
!=
0
){
if
((
*
handle
)
->
logfile
!=
0
){
fclose
((
*
handle
)
->
logfile
);
fclose
((
*
handle
)
->
logfile
);
(
*
handle
)
->
logfile
=
0
;
(
*
handle
)
->
logfile
=
0
;
}
}
#endif
#endif
free
(
*
handle
);
my_free
((
char
*
)
*
handle
,
MYF
(
MY_ALLOW_ZERO_PTR
)
);
*
handle
=
0
;
*
handle
=
0
;
}
}
...
@@ -228,7 +230,8 @@ parse_connect_string(const char * connect_string,
...
@@ -228,7 +230,8 @@ parse_connect_string(const char * connect_string,
return
-
1
;
return
-
1
;
}
}
char
*
line
=
strdup
(
connect_string
);
char
*
line
=
my_strdup
(
connect_string
,
MYF
(
MY_WME
));
My_auto_ptr
<
char
>
ap1
(
line
);
if
(
line
==
0
){
if
(
line
==
0
){
SET_ERROR
(
handle
,
NDB_MGM_OUT_OF_MEMORY
,
""
);
SET_ERROR
(
handle
,
NDB_MGM_OUT_OF_MEMORY
,
""
);
return
-
1
;
return
-
1
;
...
@@ -236,7 +239,6 @@ parse_connect_string(const char * connect_string,
...
@@ -236,7 +239,6 @@ parse_connect_string(const char * connect_string,
char
*
tmp
=
strchr
(
line
,
':'
);
char
*
tmp
=
strchr
(
line
,
':'
);
if
(
tmp
==
0
){
if
(
tmp
==
0
){
free
(
line
);
SET_ERROR
(
handle
,
NDB_MGM_OUT_OF_MEMORY
,
""
);
SET_ERROR
(
handle
,
NDB_MGM_OUT_OF_MEMORY
,
""
);
return
-
1
;
return
-
1
;
}
}
...
@@ -244,17 +246,13 @@ parse_connect_string(const char * connect_string,
...
@@ -244,17 +246,13 @@ parse_connect_string(const char * connect_string,
int
port
=
0
;
int
port
=
0
;
if
(
sscanf
(
tmp
,
"%d"
,
&
port
)
!=
1
){
if
(
sscanf
(
tmp
,
"%d"
,
&
port
)
!=
1
){
free
(
line
);
SET_ERROR
(
handle
,
NDB_MGM_ILLEGAL_PORT_NUMBER
,
""
);
SET_ERROR
(
handle
,
NDB_MGM_ILLEGAL_PORT_NUMBER
,
""
);
return
-
1
;
return
-
1
;
}
}
if
(
handle
->
hostname
!=
0
)
my_free
(
handle
->
hostname
,
MYF
(
MY_ALLOW_ZERO_PTR
));
free
(
handle
->
hostname
);
handle
->
hostname
=
my_strdup
(
line
,
MYF
(
MY_WME
));
handle
->
hostname
=
strdup
(
line
);
handle
->
port
=
port
;
handle
->
port
=
port
;
free
(
line
);
return
0
;
return
0
;
}
}
...
@@ -1653,8 +1651,11 @@ ndb_mgm_alloc_nodeid(NdbMgmHandle handle, unsigned int version, unsigned *pnodei
...
@@ -1653,8 +1651,11 @@ ndb_mgm_alloc_nodeid(NdbMgmHandle handle, unsigned int version, unsigned *pnodei
do
{
do
{
const
char
*
buf
;
const
char
*
buf
;
if
(
!
prop
->
get
(
"result"
,
&
buf
)
||
strcmp
(
buf
,
"Ok"
)
!=
0
){
if
(
!
prop
->
get
(
"result"
,
&
buf
)
||
strcmp
(
buf
,
"Ok"
)
!=
0
){
BaseString
err
;
err
.
assfmt
(
"Could not alloc node id at %s port %d: %s"
,
handle
->
hostname
,
handle
->
port
,
buf
);
setError
(
handle
,
NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET
,
__LINE__
,
setError
(
handle
,
NDB_MGM_COULD_NOT_CONNECT_TO_SOCKET
,
__LINE__
,
"Could not alloc node id: %s"
,
buf
);
err
.
c_str
()
);
break
;
break
;
}
}
if
(
!
prop
->
get
(
"nodeid"
,
pnodeid
)
!=
0
){
if
(
!
prop
->
get
(
"nodeid"
,
pnodeid
)
!=
0
){
...
...
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