This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Harald Welte gerrit-no-reply at lists.osmocom.orgHarald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/13921 ) Change subject: bankd: Don't read CSV file until _after_ handling options ...................................................................... bankd: Don't read CSV file until _after_ handling options Otherwise "--help" won't work if the CSV cannot be found/read. Change-Id: I162c40e267ea64a52baf2b5c819d9d2658daf77d --- M src/bankd/bankd_main.c 1 file changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c index 8ac5909..268794b 100644 --- a/src/bankd/bankd_main.c +++ b/src/bankd/bankd_main.c @@ -91,11 +91,7 @@ OSMO_STRLCPY_ARRAY(bankd->comp_id.sw_version, PACKAGE_VERSION); /* FIXME: other members of app_comp_id */ - /* Np lock or mutex required for the pcsc_slot_names list, as this is only - * read once during bankd initialization, when the worker threads haven't - * started yet */ INIT_LLIST_HEAD(&bankd->pcsc_slot_names); - OSMO_ASSERT(bankd_pcsc_read_slotnames(bankd, "bankd_pcsc_slots.csv") == 0); } /* create + start a new bankd_worker thread */ @@ -309,6 +305,11 @@ signal(SIGMAPDEL, handle_sig_mapdel); signal(SIGUSR1, handle_sig_usr1); + /* Np lock or mutex required for the pcsc_slot_names list, as this is only + * read once during bankd initialization, when the worker threads haven't + * started yet */ + OSMO_ASSERT(bankd_pcsc_read_slotnames(g_bankd, "bankd_pcsc_slots.csv") == 0); + /* Connection towards remsim-server */ rc = server_conn_fsm_alloc(g_bankd, srvc); if (rc < 0) { -- To view, visit https://gerrit.osmocom.org/13921 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-remsim Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I162c40e267ea64a52baf2b5c819d9d2658daf77d Gerrit-Change-Number: 13921 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190508/7aa1a1b6/attachment.htm>