Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
d1c62ca9
Commit
d1c62ca9
authored
Feb 13, 2012
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Исправил ошибку с использованием функции conf->findNode(),
т.к. она ищет везде (и в глубину и в ширину), а иногда требуется именно "на своём уровне".
parent
bf3e27cb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
3 deletions
+18
-3
MBExchange.cc
extensions/ModbusMaster/MBExchange.cc
+5
-1
MBSlave.cc
extensions/ModbusSlave/MBSlave.cc
+5
-1
SharedMemory.cc
extensions/SharedMemory/SharedMemory.cc
+8
-1
No files found.
extensions/ModbusMaster/MBExchange.cc
View file @
d1c62ca9
...
...
@@ -2218,7 +2218,11 @@ std::ostream& operator<<( std::ostream& os, const MBExchange::RSProperty& p )
// -----------------------------------------------------------------------------
void
MBExchange
::
initDeviceList
()
{
xmlNode
*
respNode
=
conf
->
findNode
(
cnode
,
"DeviceList"
);
xmlNode
*
respNode
=
0
;
UniXML
*
xml
=
conf
->
getConfXML
();
if
(
xml
)
respNode
=
xml
->
extFindNode
(
cnode
,
1
,
1
,
"DeviceList"
);
if
(
respNode
)
{
UniXML_iterator
it1
(
respNode
);
...
...
extensions/ModbusSlave/MBSlave.cc
View file @
d1c62ca9
...
...
@@ -194,7 +194,11 @@ prefix(prefix)
// build file list...
xmlNode
*
fnode
=
conf
->
findNode
(
cnode
,
"filelist"
);
xmlNode
*
fnode
=
0
;
UniXML
*
xml
=
conf
->
getConfXML
();
if
(
xml
)
fnode
=
xml
->
extFindNode
(
cnode
,
1
,
1
,
"filelist"
);
if
(
fnode
)
{
UniXML_iterator
fit
(
fnode
);
...
...
extensions/SharedMemory/SharedMemory.cc
View file @
d1c62ca9
...
...
@@ -673,7 +673,14 @@ void SharedMemory::buildHistoryList( xmlNode* cnode )
if
(
dlog
.
debugging
(
Debug
::
INFO
)
)
dlog
[
Debug
::
INFO
]
<<
myname
<<
"(buildHistoryList): ..."
<<
endl
;
xmlNode
*
n
=
conf
->
findNode
(
cnode
,
"History"
);
UniXML
*
xml
=
conf
->
getConfXML
();
if
(
!
xml
)
{
dlog
[
Debug
::
WARN
]
<<
myname
<<
"(buildHistoryList): xml=NULL?!"
<<
endl
;
return
;
}
xmlNode
*
n
=
xml
->
extFindNode
(
cnode
,
1
,
1
,
"History"
,
""
);
if
(
!
n
)
{
dlog
[
Debug
::
WARN
]
<<
myname
<<
"(buildHistoryList): <History> not found. ignore..."
<<
endl
;
...
...
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