proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 15:24:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: northbound style fixes

Browse Source 
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2020-05-14 21:23:36 -03:00
parent c6a9c60f97
commit 1be4decb04
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/northbound.c
View File

@ -735,7 +735,7 @@ int nb_running_lock(enum nb_client client, const void *user)
{ {
int ret = -1; int ret = -1;
frr_with_mutex(&running_config_mgmt_lock.mtx) { frr_with_mutex (&running_config_mgmt_lock.mtx) {
if (!running_config_mgmt_lock.locked) { if (!running_config_mgmt_lock.locked) {
running_config_mgmt_lock.locked = true; running_config_mgmt_lock.locked = true;
running_config_mgmt_lock.owner_client = client; running_config_mgmt_lock.owner_client = client;
@ -751,7 +751,7 @@ int nb_running_unlock(enum nb_client client, const void *user)
{ {
int ret = -1; int ret = -1;
frr_with_mutex(&running_config_mgmt_lock.mtx) { frr_with_mutex (&running_config_mgmt_lock.mtx) {
if (running_config_mgmt_lock.locked if (running_config_mgmt_lock.locked
&& running_config_mgmt_lock.owner_client == client && running_config_mgmt_lock.owner_client == client
&& running_config_mgmt_lock.owner_user == user) { && running_config_mgmt_lock.owner_user == user) {
@ -769,7 +769,7 @@ int nb_running_lock_check(enum nb_client client, const void *user)
{ {
int ret = -1; int ret = -1;
frr_with_mutex(&running_config_mgmt_lock.mtx) { frr_with_mutex (&running_config_mgmt_lock.mtx) {
if (!running_config_mgmt_lock.locked if (!running_config_mgmt_lock.locked
|| (running_config_mgmt_lock.owner_client == client || (running_config_mgmt_lock.owner_client == client
&& running_config_mgmt_lock.owner_user == user)) && running_config_mgmt_lock.owner_user == user))
@ -962,7 +962,6 @@ static int nb_callback_configuration(const enum nb_event event,
union nb_resource *resource; union nb_resource *resource;
int ret = NB_ERR; int ret = NB_ERR;
if (event == NB_EV_VALIDATE) if (event == NB_EV_VALIDATE)
resource = NULL; resource = NULL;
else else
@ -1014,8 +1013,8 @@ static int nb_callback_configuration(const enum nb_event event,
break; break;
default: default:
flog_err(EC_LIB_DEVELOPMENT, flog_err(EC_LIB_DEVELOPMENT,
"%s: unknown event (%u) [xpath %s]", "%s: unknown event (%u) [xpath %s]", __func__,
__func__, event, xpath); event, xpath);
exit(1); exit(1);
} }

4
lib/northbound.h
View File

@ -1044,8 +1044,8 @@ extern void *nb_running_unset_entry(const struct lyd_node *dnode);
* Returns: * Returns:
* User pointer if found, NULL otherwise. * User pointer if found, NULL otherwise.
*/ */
extern void *nb_running_get_entry(const struct lyd_node *dnode, const char *xpath, extern void *nb_running_get_entry(const struct lyd_node *dnode,
bool abort_if_not_found); const char *xpath, bool abort_if_not_found);
/* /*
* Return a human-readable string representing a northbound event. * Return a human-readable string representing a northbound event.