Commit 7be1ef6d authored by Claes Sjofors's avatar Claes Sjofors

rt_ini, error message for missing pwrp_alaias file removed

parent a8e7b3b6
......@@ -196,7 +196,7 @@ start (
errh_LogError(&cp->log, "ini_RcReadAndSet, %m", sts);
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);
qini_BuildDb(&sts, cp->nid_t, cp->me, NULL, cp->busid);
......@@ -236,7 +236,7 @@ start (
qcom_WaitAnd(&sts, &cp->eventQ, &qcom_cQini, ini_mEvent_newPlcStartDone, qcom_cTmoEternal);
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);
ini_SetSystemStatus( cp, PWR__RUNNING);
......
......@@ -165,7 +165,7 @@ ini_SetAttributeAfterPlc (
free(data_ptr);
}
ini_datafile_close();
ini_datafile_close();
return INI__SUCCESS;
}
......@@ -287,9 +287,8 @@ static int ini_datafile_init ( char *filename)
/* Open file */
ini_datafile = fopen( filename, "r");
if ( ini_datafile == 0)
{
return 0;
}
return INI__FILE;
return INI__SUCCESS;
}
......
......@@ -39,5 +39,6 @@ plcsavactval <save actual value failed, object class '%s'> /error
nodidx <cannot determine node index in ld_boot file> /error
xdr <error when marshalling> /error
insvirmem <insufficient virtual memory> /error
file <unable to open file> /error
.end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment