Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
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
Esteban Blanc
proview
Commits
7be1ef6d
Commit
7be1ef6d
authored
Jan 20, 2011
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rt_ini, error message for missing pwrp_alaias file removed
parent
a8e7b3b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/exe/rt_ini/src/rt_ini.c
src/exe/rt_ini/src/rt_ini.c
+2
-2
src/lib/rt/src/rt_ini_alias.c
src/lib/rt/src/rt_ini_alias.c
+3
-4
src/msg/rt/src/rt_ini_msg.msg
src/msg/rt/src/rt_ini_msg.msg
+1
-0
No files found.
src/exe/rt_ini/src/rt_ini.c
View file @
7be1ef6d
...
@@ -196,7 +196,7 @@ start (
...
@@ -196,7 +196,7 @@ start (
errh_LogError
(
&
cp
->
log
,
"ini_RcReadAndSet, %m"
,
sts
);
errh_LogError
(
&
cp
->
log
,
"ini_RcReadAndSet, %m"
,
sts
);
sts
=
ini_SetAttribute
(
cp
->
aliasfile
.
name
,
cp
->
nodename
,
0
);
sts
=
ini_SetAttribute
(
cp
->
aliasfile
.
name
,
cp
->
nodename
,
0
);
if
(
EVEN
(
sts
))
if
(
EVEN
(
sts
)
&&
sts
!=
INI__FILE
)
errh_LogError
(
&
cp
->
log
,
"ini_SetAttribute, %m"
,
sts
);
errh_LogError
(
&
cp
->
log
,
"ini_SetAttribute, %m"
,
sts
);
qini_BuildDb
(
&
sts
,
cp
->
nid_t
,
cp
->
me
,
NULL
,
cp
->
busid
);
qini_BuildDb
(
&
sts
,
cp
->
nid_t
,
cp
->
me
,
NULL
,
cp
->
busid
);
...
@@ -236,7 +236,7 @@ start (
...
@@ -236,7 +236,7 @@ start (
qcom_WaitAnd
(
&
sts
,
&
cp
->
eventQ
,
&
qcom_cQini
,
ini_mEvent_newPlcStartDone
,
qcom_cTmoEternal
);
qcom_WaitAnd
(
&
sts
,
&
cp
->
eventQ
,
&
qcom_cQini
,
ini_mEvent_newPlcStartDone
,
qcom_cTmoEternal
);
sts
=
ini_SetAttributeAfterPlc
(
cp
->
aliasfile
.
name
,
cp
->
nodename
,
0
);
sts
=
ini_SetAttributeAfterPlc
(
cp
->
aliasfile
.
name
,
cp
->
nodename
,
0
);
if
(
EVEN
(
sts
)
&&
sts
!=
0
)
if
(
EVEN
(
sts
)
&&
sts
!=
INI__FILE
)
errh_LogError
(
&
cp
->
log
,
"ini_SetAttributeAfterPlc, %m"
,
sts
);
errh_LogError
(
&
cp
->
log
,
"ini_SetAttributeAfterPlc, %m"
,
sts
);
ini_SetSystemStatus
(
cp
,
PWR__RUNNING
);
ini_SetSystemStatus
(
cp
,
PWR__RUNNING
);
...
...
src/lib/rt/src/rt_ini_alias.c
View file @
7be1ef6d
...
@@ -165,7 +165,7 @@ ini_SetAttributeAfterPlc (
...
@@ -165,7 +165,7 @@ ini_SetAttributeAfterPlc (
free
(
data_ptr
);
free
(
data_ptr
);
}
}
ini_datafile_close
();
ini_datafile_close
();
return
INI__SUCCESS
;
return
INI__SUCCESS
;
}
}
...
@@ -287,9 +287,8 @@ static int ini_datafile_init ( char *filename)
...
@@ -287,9 +287,8 @@ static int ini_datafile_init ( char *filename)
/* Open file */
/* Open file */
ini_datafile
=
fopen
(
filename
,
"r"
);
ini_datafile
=
fopen
(
filename
,
"r"
);
if
(
ini_datafile
==
0
)
if
(
ini_datafile
==
0
)
{
return
INI__FILE
;
return
0
;
}
return
INI__SUCCESS
;
return
INI__SUCCESS
;
}
}
...
...
src/msg/rt/src/rt_ini_msg.msg
View file @
7be1ef6d
...
@@ -39,5 +39,6 @@ plcsavactval <save actual value failed, object class '%s'> /error
...
@@ -39,5 +39,6 @@ plcsavactval <save actual value failed, object class '%s'> /error
nodidx <cannot determine node index in ld_boot file> /error
nodidx <cannot determine node index in ld_boot file> /error
xdr <error when marshalling> /error
xdr <error when marshalling> /error
insvirmem <insufficient virtual memory> /error
insvirmem <insufficient virtual memory> /error
file <unable to open file> /error
.end
.end
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