<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename the global talloc context<br><br>both the host and the firmware build require a global talloc context<br>with external linkage, so let's agree on one name.<br><br>Change-Id: Idced24869863983bfde0c9c438498999717f2042<br>---<br>M ccid_host/ccid_main_functionfs.c<br>M ccid_host/cuart_fsm_test.c<br>M ccid_host/hub_main_functionfs.c<br>3 files changed, 15 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_host/ccid_main_functionfs.c b/ccid_host/ccid_main_functionfs.c</span><br><span>index 8e95c73..d3e0c3c 100644</span><br><span>--- a/ccid_host/ccid_main_functionfs.c</span><br><span>+++ b/ccid_host/ccid_main_functionfs.c</span><br><span>@@ -506,13 +506,13 @@</span><br><span>         .send_int = ccid_ops_send_int,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void *tall_main_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+void *g_tall_ctx;</span><br><span> </span><br><span> static void signal_handler(int signal)</span><br><span> {</span><br><span>    switch (signal) {</span><br><span>    case SIGUSR1:</span><br><span style="color: hsl(0, 100%, 40%);">-           talloc_report_full(tall_main_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+            talloc_report_full(g_tall_ctx, stderr);</span><br><span>              break;</span><br><span>       }</span><br><span> }</span><br><span>@@ -523,9 +523,9 @@</span><br><span>         struct ufunc_handle ufh = (struct ufunc_handle) { 0, };</span><br><span>      int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     tall_main_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs");</span><br><span style="color: hsl(0, 100%, 40%);">-  msgb_talloc_ctx_init(tall_main_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_main_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     g_tall_ctx = talloc_named_const(NULL, 0, "ccid_main_functionfs");</span><br><span style="color: hsl(120, 100%, 40%);">+   msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span> </span><br><span>   signal(SIGUSR1, &signal_handler);</span><br><span> </span><br><span>diff --git a/ccid_host/cuart_fsm_test.c b/ccid_host/cuart_fsm_test.c</span><br><span>index 1151b34..5b03bfe 100644</span><br><span>--- a/ccid_host/cuart_fsm_test.c</span><br><span>+++ b/ccid_host/cuart_fsm_test.c</span><br><span>@@ -37,13 +37,13 @@</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void *tall_main_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+static void *g_tall_ctx;</span><br><span> </span><br><span> static void signal_handler(int signal)</span><br><span> {</span><br><span>   switch (signal) {</span><br><span>    case SIGUSR1:</span><br><span style="color: hsl(0, 100%, 40%);">-           talloc_report_full(tall_main_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+            talloc_report_full(g_tall_ctx, stderr);</span><br><span>              break;</span><br><span>       }</span><br><span> }</span><br><span>@@ -54,9 +54,9 @@</span><br><span>   uint8_t atr[64];</span><br><span>     int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     tall_main_ctx = talloc_named_const(NULL, 0, "main");</span><br><span style="color: hsl(0, 100%, 40%);">-  msgb_talloc_ctx_init(tall_main_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_main_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     g_tall_ctx = talloc_named_const(NULL, 0, "main");</span><br><span style="color: hsl(120, 100%, 40%);">+   msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span>       osmo_fsm_log_addr(false);</span><br><span> </span><br><span>        signal(SIGUSR1, &signal_handler);</span><br><span>diff --git a/ccid_host/hub_main_functionfs.c b/ccid_host/hub_main_functionfs.c</span><br><span>index c019cde..f350e50 100644</span><br><span>--- a/ccid_host/hub_main_functionfs.c</span><br><span>+++ b/ccid_host/hub_main_functionfs.c</span><br><span>@@ -464,13 +464,13 @@</span><br><span>       .num_cat = ARRAY_SIZE(log_info_cat),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void *tall_main_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+static void *g_tall_ctx;</span><br><span> </span><br><span> static void signal_handler(int signal)</span><br><span> {</span><br><span>       switch (signal) {</span><br><span>    case SIGUSR1:</span><br><span style="color: hsl(0, 100%, 40%);">-           talloc_report_full(tall_main_ctx, stderr);</span><br><span style="color: hsl(120, 100%, 40%);">+            talloc_report_full(g_tall_ctx, stderr);</span><br><span>              break;</span><br><span>       }</span><br><span> }</span><br><span>@@ -481,9 +481,9 @@</span><br><span>         struct ufunc_handle ufh = (struct ufunc_handle) { 0, };</span><br><span>      int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     tall_main_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs");</span><br><span style="color: hsl(0, 100%, 40%);">-   msgb_talloc_ctx_init(tall_main_ctx, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_main_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+     g_tall_ctx = talloc_named_const(NULL, 0, "hub_main_functionfs");</span><br><span style="color: hsl(120, 100%, 40%);">+    msgb_talloc_ctx_init(g_tall_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+  osmo_init_logging2(g_tall_ctx, &log_info);</span><br><span> </span><br><span>   signal(SIGUSR1, &signal_handler);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/16401">change 16401</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/c/osmo-ccid-firmware/+/16401"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Idced24869863983bfde0c9c438498999717f2042 </div>
<div style="display:none"> Gerrit-Change-Number: 16401 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>