<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13534">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty/talloc_ctx_vty.c: allocate walk_cb_params on stack, not heap<br><br>There is no need to allocate struct 'walk_cb_params' dynamically.<br><br>Change-Id: I96f25f1ddb36b19b12055deaeeb6f58e59180e72<br>---<br>M src/vty/talloc_ctx_vty.c<br>1 file changed, 15 insertions(+), 43 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/34/13534/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/vty/talloc_ctx_vty.c b/src/vty/talloc_ctx_vty.c</span><br><span>index e7fe675..c4d5a88 100644</span><br><span>--- a/src/vty/talloc_ctx_vty.c</span><br><span>+++ b/src/vty/talloc_ctx_vty.c</span><br><span>@@ -180,22 +180,13 @@</span><br><span> DEFUN(show_talloc_ctx, show_talloc_ctx_cmd,</span><br><span> BASE_CMD_STR, BASE_CMD_DESCR)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct walk_cb_params *params;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate memory */</span><br><span style="color: hsl(0, 100%, 40%);">- params = talloc_zero(tall_vty_ctx, struct walk_cb_params);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!params)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct walk_cb_params params = { 0 };</span><br><span> </span><br><span> /* Set up callback parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- params->filter = WALK_FILTER_NONE;</span><br><span style="color: hsl(0, 100%, 40%);">- params->vty = vty;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.filter = WALK_FILTER_NONE;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.vty = vty;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- talloc_ctx_walk(argv[0], argv[1], params);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Free memory */</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(params);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_ctx_walk(argv[0], argv[1], ¶ms);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -204,31 +195,22 @@</span><br><span> "Filter chunks using regular expression\n"</span><br><span> "Regular expression\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct walk_cb_params *params;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct walk_cb_params params = { 0 };</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate memory */</span><br><span style="color: hsl(0, 100%, 40%);">- params = talloc_zero(tall_vty_ctx, struct walk_cb_params);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!params)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Attempt to compile a regular expression */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = regcomp(¶ms->regexp, argv[2], 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = regcomp(¶ms.regexp, argv[2], 0);</span><br><span> if (rc) {</span><br><span> vty_out(vty, "Invalid expression%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(params);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> /* Set up callback parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- params->filter = WALK_FILTER_REGEXP;</span><br><span style="color: hsl(0, 100%, 40%);">- params->vty = vty;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.filter = WALK_FILTER_REGEXP;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.vty = vty;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- talloc_ctx_walk(argv[0], argv[1], params);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Free memory */</span><br><span style="color: hsl(0, 100%, 40%);">- regfree(¶ms->regexp);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(params);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_ctx_walk(argv[0], argv[1], ¶ms);</span><br><span style="color: hsl(120, 100%, 40%);">+ regfree(¶ms.regexp);</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -238,31 +220,21 @@</span><br><span> "Display only a specific memory chunk\n"</span><br><span> "Chunk address (e.g. 0xdeadbeef)\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct walk_cb_params *params;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct walk_cb_params params = { 0 };</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate memory */</span><br><span style="color: hsl(0, 100%, 40%);">- params = talloc_zero(tall_vty_ctx, struct walk_cb_params);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!params)</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Attempt to parse an address */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = sscanf(argv[2], "%p", ¶ms->chunk_ptr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = sscanf(argv[2], "%p", ¶ms.chunk_ptr);</span><br><span> if (rc != 1) {</span><br><span> vty_out(vty, "Invalid chunk address%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(params);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> /* Set up callback parameters */</span><br><span style="color: hsl(0, 100%, 40%);">- params->filter = WALK_FILTER_TREE;</span><br><span style="color: hsl(0, 100%, 40%);">- params->vty = vty;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.filter = WALK_FILTER_TREE;</span><br><span style="color: hsl(120, 100%, 40%);">+ params.vty = vty;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- talloc_ctx_walk(argv[0], argv[1], params);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Free memory */</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(params);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_ctx_walk(argv[0], argv[1], ¶ms);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13534">change 13534</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/13534"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I96f25f1ddb36b19b12055deaeeb6f58e59180e72 </div>
<div style="display:none"> Gerrit-Change-Number: 13534 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>