* Changed return values in internal functions: netconf_trymerge, startup_module_state, yang_modules_state_get

This commit is contained in:
Olof hagsand 2019-05-07 13:26:34 +02:00
parent c529847790
commit 1cfb190ea9
6 changed files with 80 additions and 40 deletions

View file

@ -1048,8 +1048,8 @@ netconf_minmax_elements(cbuf *cb,
* @param[in] yspec Yang spec
* @param[in,out] xret Existing XML tree, merge x into this
* @retval -1 Error (fatal)
* @retval 0 OK
* @retval 1 Statedata callback failed
* @retval 0 Statedata callback failed
* @retval 1 OK
*/
int
netconf_trymerge(cxobj *x,
@ -1072,18 +1072,19 @@ netconf_trymerge(cxobj *x,
xml_purge(xc);
if (netconf_operation_failed_xml(xret, "rpc", reason)< 0)
goto done;
retval = 1;
goto done;
goto fail;
}
ok:
retval = 0;
retval = 1;
done:
if (reason)
free(reason);
return retval;
fail:
retval = 0;
goto done;
}
/*! Load ietf netconf yang module and set enabled features
* The features added are (in order):
* candidate (8.3)