From 67e90d5a9b2c5ea81ccf51845414639fdb83aca1 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Mon, 4 Jun 2018 18:38:18 +0200 Subject: [PATCH] Code style: Use { } even in 1-line if --- lib/include/srslte/common/timers.h | 2 +- srsenb/src/upper/gtpu.cc | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/include/srslte/common/timers.h b/lib/include/srslte/common/timers.h index 1b2bc1f83..046dae3e1 100644 --- a/lib/include/srslte/common/timers.h +++ b/lib/include/srslte/common/timers.h @@ -143,7 +143,7 @@ public: used_timers[i] = false; nof_used_timers--; } else { - fprintf(stderr, "Error releasing timer: nof_used_timers=%d, nof_timers=%d\n", nof_used_timers, nof_timers); + fprintf(stderr, "Error releasing timer id=%d: nof_used_timers=%d, nof_timers=%d\n", i, nof_used_timers, nof_timers); } } uint32_t get_unique_id() { diff --git a/srsenb/src/upper/gtpu.cc b/srsenb/src/upper/gtpu.cc index ebce49a3b..62b25a29c 100644 --- a/srsenb/src/upper/gtpu.cc +++ b/srsenb/src/upper/gtpu.cc @@ -207,8 +207,9 @@ void gtpu::stop() { if (run_enable) { run_enable = false; - if(mch_run_enable) - mch_run_enable = false; + if(mch_run_enable) { + mch_run_enable = false; + } // Wait thread to exit gracefully otherwise might leave a mutex locked int cnt=0; @@ -218,8 +219,9 @@ void gtpu::stop() } if (running) { thread_cancel(); - if(mch_running) + if(mch_running) { pthread_cancel(mch_thread); + } } wait_thread_finish(); pthread_join(mch_thread, NULL); @@ -255,11 +257,11 @@ void gtpu::write_pdu(uint16_t rnti, uint32_t lcid, srslte::byte_buffer_t* pdu) } pool->deallocate(pdu); - } +} - // gtpu_interface_rrc - void gtpu::add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t *teid_in) - { +// gtpu_interface_rrc +void gtpu::add_bearer(uint16_t rnti, uint32_t lcid, uint32_t addr, uint32_t teid_out, uint32_t *teid_in) +{ // Allocate a TEID for the incoming tunnel rntilcid_to_teidin(rnti, lcid, teid_in); //gtpu_log->info("Adding bearer for rnti: 0x%x, lcid: %d, addr: 0x%x, teid_out: 0x%x, teid_in: 0x%x\n", rnti, lcid, addr, teid_out, *teid_in);