<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19692">View Change</a></p><div style="white-space:pre-wrap">Approvals:
fixeria: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: Rename main talloc ctx<br><br>It contained name from a different program, probably due to main.c being<br>copied over during project start.<br><br>Change-Id: I4bfa40eec0277705f5d3335d779bff35518470a8<br>---<br>M src/osmo-mgw/mgw_main.c<br>1 file changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-mgw/mgw_main.c b/src/osmo-mgw/mgw_main.c</span><br><span>index af73380..7f4df2e 100644</span><br><span>--- a/src/osmo-mgw/mgw_main.c</span><br><span>+++ b/src/osmo-mgw/mgw_main.c</span><br><span>@@ -93,7 +93,7 @@</span><br><span> static char *config_file = "osmo-mgw.cfg";</span><br><span> </span><br><span> /* used by msgb and mgcp */</span><br><span style="color: hsl(0, 100%, 40%);">-void *tall_bsc_ctx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+void *tall_mgw_ctx = NULL;</span><br><span> </span><br><span> static void print_help()</span><br><span> {</span><br><span>@@ -141,7 +141,7 @@</span><br><span> exit(2);</span><br><span> }</span><br><span> case 'c':</span><br><span style="color: hsl(0, 100%, 40%);">- config_file = talloc_strdup(tall_bsc_ctx, optarg);</span><br><span style="color: hsl(120, 100%, 40%);">+ config_file = talloc_strdup(tall_mgw_ctx, optarg);</span><br><span> break;</span><br><span> case 's':</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span>@@ -292,14 +292,14 @@</span><br><span> unsigned int flags;</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- tall_bsc_ctx = talloc_named_const(NULL, 1, "mgcp-callagent");</span><br><span style="color: hsl(0, 100%, 40%);">- vty_info.tall_ctx = tall_bsc_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+ tall_mgw_ctx = talloc_named_const(NULL, 1, "mgcp-callagent");</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_info.tall_ctx = tall_mgw_ctx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msgb_talloc_ctx_init(tall_bsc_ctx, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_talloc_ctx_init(tall_mgw_ctx, 0);</span><br><span> </span><br><span> osmo_init_ignore_signals();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_init_logging2(tall_bsc_ctx, &log_info);</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo_abis_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_init_logging2(tall_mgw_ctx, &log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ libosmo_abis_init(tall_mgw_ctx);</span><br><span> </span><br><span> cfg = mgcp_config_alloc();</span><br><span> if (!cfg)</span><br><span>@@ -313,19 +313,19 @@</span><br><span> mgcp_vty_init();</span><br><span> ctrl_vty_init(cfg);</span><br><span> e1inp_vty_init();</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_cpu_sched_vty_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_cpu_sched_vty_init(tall_mgw_ctx);</span><br><span> </span><br><span> handle_options(argc, argv);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_init(tall_bsc_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_stats_init(tall_bsc_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_init(tall_mgw_ctx);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stats_init(tall_mgw_ctx);</span><br><span> </span><br><span> rc = mgcp_parse_config(config_file, cfg, MGCP_BSC);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span> </span><br><span> /* start telnet after reading config for vty_get_bind_addr() */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = telnet_init_dynif(tall_bsc_ctx, NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = telnet_init_dynif(tall_mgw_ctx, NULL,</span><br><span> vty_get_bind_addr(), OSMO_VTY_PORT_MGW);</span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19692">change 19692</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-mgw/+/19692"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I4bfa40eec0277705f5d3335d779bff35518470a8 </div>
<div style="display:none"> Gerrit-Change-Number: 19692 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>