git.stg.codes
/
stg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a340847
)
Fixed compilation of sgconf_xml.
author
Maxim Mamontov
<faust.madf@gmail.com>
Sun, 18 Jan 2015 18:12:00 +0000
(20:12 +0200)
committer
Maxim Mamontov
<faust.madf@gmail.com>
Sun, 18 Jan 2015 18:12:00 +0000
(20:12 +0200)
projects/sgconf_xml/main.cpp
patch
|
blob
|
history
diff --git
a/projects/sgconf_xml/main.cpp
b/projects/sgconf_xml/main.cpp
index 03a63a9ada0deb87ca7f990a8f317dbafcd851c9..2d8975733e02e14076ba382d1406881ec76af658 100644
(file)
--- a/
projects/sgconf_xml/main.cpp
+++ b/
projects/sgconf_xml/main.cpp
@@
-108,7
+108,7
@@
void CreateRequest(REQUEST * req, char * r)
char str[10024];
r[0] = 0;
char str[10024];
r[0] = 0;
-if (!req->strReq.
res_
empty())
+if (!req->strReq.empty())
{
sprintf(str, "%s", req->strReq.const_data().c_str());
strcat(r, str);
{
sprintf(str, "%s", req->strReq.const_data().c_str());
strcat(r, str);
@@
-140,7
+140,7
@@
char str[2048];
NETTRANSACT nt;
nt.SetServer(r->server.const_data().c_str());
NETTRANSACT nt;
nt.SetServer(r->server.const_data().c_str());
-nt.SetServerPort(r->port);
+nt.SetServerPort(r->port
.const_data()
);
nt.SetLogin(r->admLogin.const_data().c_str());
nt.SetPassword(r->admPasswd.const_data().c_str());
nt.SetRxCallback(NULL, ParseReply);
nt.SetLogin(r->admLogin.const_data().c_str());
nt.SetPassword(r->admPasswd.const_data().c_str());
nt.SetRxCallback(NULL, ParseReply);
@@
-169,13
+169,13
@@
return 0;
//-----------------------------------------------------------------------------
int CheckParameters(REQUEST * req)
{
//-----------------------------------------------------------------------------
int CheckParameters(REQUEST * req)
{
-int a = !req->admLogin.
res_
empty()
- && !req->admPasswd.
res_
empty()
- && !req->server.
res_
empty()
- && !req->port.
res_
empty();
+int a = !req->admLogin.empty()
+ && !req->admPasswd.empty()
+ && !req->server.empty()
+ && !req->port.empty();
-int b = !req->fileReq.
res_
empty()
- || !req->strReq.
res_
empty();
+int b = !req->fileReq.empty()
+ || !req->strReq.empty();
return a && b;
}
return a && b;
}