<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19711">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  neels: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_e1: remove unused struct member trunk->e1.line<br><br>The struct member trunk->e1.line is never set. Also it is always<br>possible to use e1inp_line_find() to get a pointer to the e1.line.<br>Lets remove it.<br><br>Change-Id: Id4ff52285917ce3885b8dad3a16270999c9da0aa<br>---<br>M include/osmocom/mgcp/mgcp_trunk.h<br>M src/libosmo-mgcp/mgcp_e1.c<br>2 files changed, 6 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/mgcp/mgcp_trunk.h b/include/osmocom/mgcp/mgcp_trunk.h</span><br><span>index d99f801..1002adb 100644</span><br><span>--- a/include/osmocom/mgcp/mgcp_trunk.h</span><br><span>+++ b/include/osmocom/mgcp/mgcp_trunk.h</span><br><span>@@ -60,7 +60,6 @@</span><br><span>          /* E1 specific */</span><br><span>            struct {</span><br><span>                     unsigned int vty_line_nr;</span><br><span style="color: hsl(0, 100%, 40%);">-                       struct e1inp_line *line;</span><br><span>                     bool ts_in_use[31];</span><br><span>                  struct osmo_i460_timeslot i460_ts[31];</span><br><span>               } e1;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_e1.c b/src/libosmo-mgcp/mgcp_e1.c</span><br><span>index 3bd9a99..50a2d85 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_e1.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_e1.c</span><br><span>@@ -385,18 +385,13 @@</span><br><span>   }</span><br><span> </span><br><span>        /* Get E1 line */</span><br><span style="color: hsl(0, 100%, 40%);">-       if (!trunk->e1.line) {</span><br><span style="color: hsl(0, 100%, 40%);">-               e1_line = e1inp_line_find(trunk->e1.vty_line_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-            if (!e1_line) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 LOGPTRUNK(trunk, DE1, LOGL_DEBUG, "no such E1 line %u - check VTY config!\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                           trunk->e1.vty_line_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-                    return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-         }</span><br><span style="color: hsl(0, 100%, 40%);">-               e1inp_line_bind_ops(e1_line, &dummy_e1_line_ops);</span><br><span style="color: hsl(0, 100%, 40%);">-   } else</span><br><span style="color: hsl(0, 100%, 40%);">-          e1_line = trunk->e1.line;</span><br><span style="color: hsl(0, 100%, 40%);">-    if (!e1_line)</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line = e1inp_line_find(trunk->e1.vty_line_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+  if (!e1_line) {</span><br><span style="color: hsl(120, 100%, 40%);">+               LOGPTRUNK(trunk, DE1, LOGL_DEBUG, "no such E1 line %u - check VTY config!\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                         trunk->e1.vty_line_nr);</span><br><span>                 return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+       }</span><br><span style="color: hsl(120, 100%, 40%);">+     e1inp_line_bind_ops(e1_line, &dummy_e1_line_ops);</span><br><span> </span><br><span>    /* Configure E1 timeslot */</span><br><span>  rc = e1inp_ts_config_raw(&e1_line->ts[ts_nr - 1], e1_line, e1_recv_cb);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-mgw/+/19711">change 19711</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/+/19711"/><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: Id4ff52285917ce3885b8dad3a16270999c9da0aa </div>
<div style="display:none"> Gerrit-Change-Number: 19711 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>