fix coverity va_list issues

master
Francisco Paisana 5 years ago committed by Francisco Paisana
parent 7312752988
commit c29d8b418a

@ -242,6 +242,7 @@ public:
private: private:
struct base_task { struct base_task {
virtual ~base_task() {}
virtual void operator()() = 0; virtual void operator()() = 0;
}; };
template <typename Func> template <typename Func>

@ -110,6 +110,7 @@ public:
va_list args; va_list args;
va_start(args, message); va_start(args, message);
log_va_list(LOG_LEVEL_DEBUG, message, args); log_va_list(LOG_LEVEL_DEBUG, message, args);
va_end(args);
} }
void info(const char* message, ...) override __attribute__((format(printf, 2, 3))) void info(const char* message, ...) override __attribute__((format(printf, 2, 3)))
@ -117,6 +118,7 @@ public:
va_list args; va_list args;
va_start(args, message); va_start(args, message);
log_va_list(LOG_LEVEL_INFO, message, args); log_va_list(LOG_LEVEL_INFO, message, args);
va_end(args);
} }
void warning(const char* message, ...) override __attribute__((format(printf, 2, 3))) void warning(const char* message, ...) override __attribute__((format(printf, 2, 3)))
@ -125,6 +127,7 @@ public:
va_list args; va_list args;
va_start(args, message); va_start(args, message);
log_va_list(LOG_LEVEL_WARNING, message, args); log_va_list(LOG_LEVEL_WARNING, message, args);
va_end(args);
} }
void error(const char* message, ...) override __attribute__((format(printf, 2, 3))) void error(const char* message, ...) override __attribute__((format(printf, 2, 3)))
@ -133,6 +136,7 @@ public:
va_list args; va_list args;
va_start(args, message); va_start(args, message);
log_va_list(LOG_LEVEL_ERROR, message, args); log_va_list(LOG_LEVEL_ERROR, message, args);
va_end(args);
if (exit_on_error) { if (exit_on_error) {
exit(-1); exit(-1);
} }
@ -151,7 +155,6 @@ private:
last_log_msg = args_msg; last_log_msg = args_msg;
} }
} }
va_end(argp);
} }
}; };

@ -167,6 +167,7 @@ void to_asn1(asn1::rrc::rlc_cfg_c* asn1_type, const srslte::rlc_config_t& cfg)
(asn1::rrc::sn_field_len_opts::options)cfg.um.rx_sn_field_length; (asn1::rrc::sn_field_len_opts::options)cfg.um.rx_sn_field_length;
asn1_type->um_bi_dir().ul_um_rlc.sn_field_len.value = asn1_type->um_bi_dir().ul_um_rlc.sn_field_len.value =
(asn1::rrc::sn_field_len_opts::options)cfg.um.tx_sn_field_length; (asn1::rrc::sn_field_len_opts::options)cfg.um.tx_sn_field_length;
break;
case rlc_mode_t::am: case rlc_mode_t::am:
asn1_type->set_am(); asn1_type->set_am();
asn1::number_to_enum(asn1_type->am().ul_am_rlc.t_poll_retx, cfg.am.t_poll_retx); asn1::number_to_enum(asn1_type->am().ul_am_rlc.t_poll_retx, cfg.am.t_poll_retx);

Loading…
Cancel
Save