From 411d6db2c59d4658088a20ae4fc21b04b28059c7 Mon Sep 17 00:00:00 2001 From: Mark Rustad Date: Mon, 15 Aug 2011 18:14:38 -0700 Subject: [PATCH 25/29] lldpad: Fix error path in save_dcbx_version One error path would not return an error indication to the caller. Fix that and eliminate the useless rval variable. Signed-off-by: Mark Rustad Tested-by: Ross Brattain Signed-off-by: John Fastabend Signed-off-by: Petr Sabata --- lldp_dcbx_cfg.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lldp_dcbx_cfg.c b/lldp_dcbx_cfg.c index 0477c54..7a447e3 100644 --- a/lldp_dcbx_cfg.c +++ b/lldp_dcbx_cfg.c @@ -612,19 +612,17 @@ int save_dcb_enable_state(char *device_name, int dcb_enable) int save_dcbx_version(int dcbx_version) { - config_setting_t *dcbx_setting = NULL; - config_setting_t *setting = NULL; - int rval = dcb_success; + config_setting_t *dcbx_setting; + config_setting_t *setting; dcbx_setting = config_lookup(&lldpad_cfg, DCBX_SETTING); if (!dcbx_setting) return 1; setting = config_setting_get_member(dcbx_setting, "dcbx_version"); - if (!setting || !config_setting_set_int(setting, dcbx_version) || !config_write_file(&lldpad_cfg, cfg_file_name)) - rval = dcb_failed; + return 1; return 0; } -- 1.7.6