<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13921">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bankd: Don't read CSV file until _after_ handling options<br><br>Otherwise "--help" won't work if the CSV cannot be found/read.<br><br>Change-Id: I162c40e267ea64a52baf2b5c819d9d2658daf77d<br>---<br>M src/bankd/bankd_main.c<br>1 file changed, 5 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/bankd/bankd_main.c b/src/bankd/bankd_main.c</span><br><span>index 8ac5909..268794b 100644</span><br><span>--- a/src/bankd/bankd_main.c</span><br><span>+++ b/src/bankd/bankd_main.c</span><br><span>@@ -91,11 +91,7 @@</span><br><span>     OSMO_STRLCPY_ARRAY(bankd->comp_id.sw_version, PACKAGE_VERSION);</span><br><span>   /* FIXME: other members of app_comp_id */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   /* Np lock or mutex required for the pcsc_slot_names list, as this is only</span><br><span style="color: hsl(0, 100%, 40%);">-       * read once during bankd initialization, when the worker threads haven't</span><br><span style="color: hsl(0, 100%, 40%);">-    * started yet */</span><br><span>    INIT_LLIST_HEAD(&bankd->pcsc_slot_names);</span><br><span style="color: hsl(0, 100%, 40%);">-        OSMO_ASSERT(bankd_pcsc_read_slotnames(bankd, "bankd_pcsc_slots.csv") == 0);</span><br><span> }</span><br><span> </span><br><span> /* create + start a new bankd_worker thread */</span><br><span>@@ -309,6 +305,11 @@</span><br><span>      signal(SIGMAPDEL, handle_sig_mapdel);</span><br><span>        signal(SIGUSR1, handle_sig_usr1);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Np lock or mutex required for the pcsc_slot_names list, as this is only</span><br><span style="color: hsl(120, 100%, 40%);">+     * read once during bankd initialization, when the worker threads haven't</span><br><span style="color: hsl(120, 100%, 40%);">+  * started yet */</span><br><span style="color: hsl(120, 100%, 40%);">+     OSMO_ASSERT(bankd_pcsc_read_slotnames(g_bankd, "bankd_pcsc_slots.csv") == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>    /* Connection towards remsim-server */</span><br><span>       rc = server_conn_fsm_alloc(g_bankd, srvc);</span><br><span>   if (rc < 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13921">change 13921</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13921"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-remsim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I162c40e267ea64a52baf2b5c819d9d2658daf77d </div>
<div style="display:none"> Gerrit-Change-Number: 13921 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>