<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/18735">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;">fix "-Werror" build against latest libosmo-abis<br><br>libosmo-abisrecently marked the 'out_cb' of the subchan_demux<br>as 'const', which caused compiler warnings/errors.<br><br>Related: libosmo-abis.git Ia082b9fddf03d02afd007825a1588a3ef0dbedae<br>Change-Id: I0cf430980e50fa8094f0efc7642004fb5923c4c6<br>---<br>M src/e1cap_dump.c<br>M src/flip_bits.c<br>M src/flip_bits.h<br>3 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1cap_dump.c b/src/e1cap_dump.c</span><br><span>index bcb4916..4cc8538 100644</span><br><span>--- a/src/e1cap_dump.c</span><br><span>+++ b/src/e1cap_dump.c</span><br><span>@@ -153,11 +153,12 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void handle_data(struct osmo_e1cap_pkthdr *pkt, uint8_t *data, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+static void handle_data(struct osmo_e1cap_pkthdr *pkt, const uint8_t *idata, int len)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+     uint8_t data[len];</span><br><span>   struct timeval tv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  flip_buf_bits(data, len);</span><br><span style="color: hsl(120, 100%, 40%);">+     flip_buf_bits(data, idata, len);</span><br><span> #if 0</span><br><span>    /* filter out all-ff/all-fe/all-7f */</span><br><span>        if (all_bytes_are(0xff, data, len) ||</span><br><span>@@ -193,7 +194,7 @@</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int subch_demux_out_cb(struct subch_demux *dmx, int ch, uint8_t *data,</span><br><span style="color: hsl(120, 100%, 40%);">+static int subch_demux_out_cb(struct subch_demux *dmx, int ch, const ubit_t *data,</span><br><span>                        int len, void *c)</span><br><span> {</span><br><span>         OSMO_ASSERT(ch == g_filter_subslot);</span><br><span>diff --git a/src/flip_bits.c b/src/flip_bits.c</span><br><span>index f33994e..6b382ed 100644</span><br><span>--- a/src/flip_bits.c</span><br><span>+++ b/src/flip_bits.c</span><br><span>@@ -16,14 +16,13 @@</span><br><span>         }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t *flip_buf_bits(uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t *flip_buf_bits(uint8_t *out, const uint8_t *in, int len)</span><br><span> {</span><br><span>         int i;</span><br><span style="color: hsl(0, 100%, 40%);">-        uint8_t *start = buf;</span><br><span> </span><br><span>         for (i = 0 ; i < len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-                buf[i] = flip_table[(uint8_t)buf[i]];</span><br><span style="color: hsl(120, 100%, 40%);">+                out[i] = flip_table[(uint8_t)in[i]];</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        return start;</span><br><span style="color: hsl(120, 100%, 40%);">+        return out;</span><br><span> }</span><br><span>diff --git a/src/flip_bits.h b/src/flip_bits.h</span><br><span>index 319a181..249e45b 100644</span><br><span>--- a/src/flip_bits.h</span><br><span>+++ b/src/flip_bits.h</span><br><span>@@ -1,4 +1,4 @@</span><br><span> #pragma once</span><br><span> </span><br><span> void init_flip_bits(void);</span><br><span style="color: hsl(0, 100%, 40%);">-uint8_t *flip_buf_bits(uint8_t * buf , int len);</span><br><span style="color: hsl(120, 100%, 40%);">+uint8_t *flip_buf_bits(uint8_t *out, const uint8_t *in, int len);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1-recorder/+/18735">change 18735</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-e1-recorder/+/18735"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-e1-recorder </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0cf430980e50fa8094f0efc7642004fb5923c4c6 </div>
<div style="display:none"> Gerrit-Change-Number: 18735 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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>