From 5a6bcfb7977b9db8964016582e51218a60c8431f Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 1 Sep 2017 14:36:44 +0200 Subject: [PATCH] cosmetic: convert explicit warnings to fixme/todo We do not use this style (#warning as an issue tracker replacement) in any other Osmocom project. Also those warnings clutter compiler output making it harder to spot warnings for the actual code. Change-Id: I72070e2a027e60e8b80c12ccfa23ff075434689f --- src/bts.cpp | 2 +- src/gprs_rlcmac_meas.cpp | 2 +- src/gprs_rlcmac_sched.cpp | 3 ++- src/osmobts_sock.cpp | 3 ++- src/tbf.cpp | 4 ++-- src/tbf_dl.cpp | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index add6ab35..b7685698 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -649,7 +649,7 @@ int BTS::rcv_rach(uint16_t ra, uint32_t Fn, int16_t qta, uint8_t is_11bit, } } else { // Create new TBF - #warning "Copy and paste with other routines.." + /* FIXME: Copy and paste with other routines.. */ if (is_11bit) { tbf = tbf_alloc_ul_tbf(&m_bts, NULL, -1, 0, diff --git a/src/gprs_rlcmac_meas.cpp b/src/gprs_rlcmac_meas.cpp index d6bbc196..41a75316 100644 --- a/src/gprs_rlcmac_meas.cpp +++ b/src/gprs_rlcmac_meas.cpp @@ -28,7 +28,7 @@ /* * downlink measurement */ -#warning "TODO: trigger the measurement report from the pollcontroller and use it for flow control" +/* TODO: trigger the measurement report from the pollcontroller and use it for flow control */ /* received Measurement Report */ int gprs_rlcmac_meas_rep(Packet_Measurement_Report_t *pmr) diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index e059ae16..23508082 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -60,7 +60,8 @@ static uint32_t sched_poll(BTS *bts, || ul_tbf->ul_ass_state == GPRS_RLCMAC_UL_ASS_SEND_ASS_REJ) *ul_ass_tbf = ul_tbf; -#warning "Is this supposed to be fair? The last TBF for each wins? Maybe use llist_add_tail and skip once we have all states?" +/* FIXME: Is this supposed to be fair? The last TBF for each wins? Maybe use llist_add_tail and skip once we have all +states? */ } llist_for_each(pos, &bts->dl_tbfs()) { dl_tbf = as_dl_tbf(pos->entry()); diff --git a/src/osmobts_sock.cpp b/src/osmobts_sock.cpp index e9b85ab7..31715d50 100644 --- a/src/osmobts_sock.cpp +++ b/src/osmobts_sock.cpp @@ -108,7 +108,8 @@ static void pcu_sock_close(struct pcu_sock_state *state, int lost) #endif for (ts = 0; ts < 8; ts++) bts->trx[trx].pdch[ts].disable(); -#warning "NOT ALL RESOURCES are freed in this case... inconsistent with the other code. Share the code with pcu_l1if.c for the reset." +/* FIXME: NOT ALL RESOURCES are freed in this case... inconsistent with the other code. Share the code with pcu_l1if.c +for the reset. */ gprs_rlcmac_tbf::free_all(&bts->trx[trx]); } diff --git a/src/tbf.cpp b/src/tbf.cpp index c5f43482..8e541570 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -382,7 +382,7 @@ gprs_rlcmac_ul_tbf *tbf_alloc_ul(struct gprs_rlcmac_bts *bts, { struct gprs_rlcmac_ul_tbf *tbf; -#warning "Copy and paste with tbf_new_dl_assignment" +/* FIXME: Copy and paste with tbf_new_dl_assignment */ /* create new TBF, use same TRX as DL TBF */ /* use multislot class of downlink TBF */ tbf = tbf_alloc_ul_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, 0); @@ -465,7 +465,7 @@ void tbf_free(struct gprs_rlcmac_tbf *tbf) get_value_string(gprs_rlcmac_tbf_dl_ass_state_names, tbf->dl_ass_state)); tbf->stop_timer(); - #warning "TODO: Could/Should generate bssgp_tx_llc_discarded" + /* TODO: Could/Should generate bssgp_tx_llc_discarded */ tbf_unlink_pdch(tbf); llist_del(&tbf->list()); diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index b350720f..1dd7dd8a 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -145,7 +145,7 @@ static int tbf_new_dl_assignment(struct gprs_rlcmac_bts *bts, } // Create new TBF (any TRX) -#warning "Copy and paste with alloc_ul_tbf" +/* FIXME: Copy and paste with alloc_ul_tbf */ /* set number of downlink slots according to multislot class */ dl_tbf = tbf_alloc_dl_tbf(bts, ms, use_trx, ms_class, egprs_ms_class, ss);