Merge pull request #845 from Mariosmsk/dev
Fix typo - use errcode instead of status (EN_getnodevalues, EN_getlinkvalues)
This commit is contained in:
14
src/epanet.c
14
src/epanet.c
@@ -2446,13 +2446,12 @@ int DLLEXPORT EN_getnodevalues(EN_Project p, int property, double *values)
|
|||||||
**----------------------------------------------------------------
|
**----------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
int status = 0, i = 0;
|
int errcode = 0, i = 0;
|
||||||
|
|
||||||
for (i = 1; i <= p->network.Nnodes; i++)
|
for (i = 1; i <= p->network.Nnodes; i++)
|
||||||
{
|
{
|
||||||
status = EN_getnodevalue(p, i, property, &values[i - 1]);
|
errcode = EN_getnodevalue(p, i, property, &values[i - 1]);
|
||||||
// if status is not 0, return the error code
|
if (errcode != 0) { return errcode; }
|
||||||
if (status != 0) { return status; }
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -4034,12 +4033,11 @@ int DLLEXPORT EN_getlinkvalues(EN_Project p, int property, double *values)
|
|||||||
**----------------------------------------------------------------
|
**----------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
int status = 0, i = 0;
|
int errcode = 0, i = 0;
|
||||||
for(i = 1; i <= p->network.Nlinks; i++)
|
for(i = 1; i <= p->network.Nlinks; i++)
|
||||||
{
|
{
|
||||||
status = EN_getlinkvalue(p, i, property, &values[i-1]);
|
errcode = EN_getlinkvalue(p, i, property, &values[i-1]);
|
||||||
// If an error occurs, return the error code
|
if(errcode != 0) { return errcode; }
|
||||||
if(status != 0) { return status; }
|
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user