<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/openbsc/+/17917">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix compilation with gcc-10<br><br>See also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000648.html<br><br>Change-Id: I0e9596c3ef26231999c729b5cc408fcaca3790fc<br>---<br>M openbsc/include/openbsc/gsm_data_shared.h<br>M openbsc/src/libbsc/bsc_subscriber.c<br>2 files changed, 8 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/17/17917/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h</span><br><span>index e616c12..23acf2f 100644</span><br><span>--- a/openbsc/include/openbsc/gsm_data_shared.h</span><br><span>+++ b/openbsc/include/openbsc/gsm_data_shared.h</span><br><span>@@ -379,13 +379,13 @@</span><br><span> #endif</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum {</span><br><span style="color: hsl(120, 100%, 40%);">+enum gsm_bts_trx_ts_flags {</span><br><span>    TS_F_PDCH_ACTIVE =              0x1000,</span><br><span>      TS_F_PDCH_ACT_PENDING =         0x2000,</span><br><span>      TS_F_PDCH_DEACT_PENDING =       0x4000,</span><br><span>      TS_F_PDCH_PENDING_MASK =        0x6000 /*<</span><br><span>                        TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */</span><br><span style="color: hsl(0, 100%, 40%);">-} gsm_bts_trx_ts_flags;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span> /* One Timeslot in a TRX */</span><br><span> struct gsm_bts_trx_ts {</span><br><span>@@ -945,8 +945,8 @@</span><br><span> const char *btsvariant2str(enum gsm_bts_type_variant v);</span><br><span> </span><br><span> extern const struct value_string gsm_chreq_descs[];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gsm_pchant_names[13];</span><br><span style="color: hsl(0, 100%, 40%);">-const struct value_string gsm_pchant_descs[13];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm_pchant_names[13];</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string gsm_pchant_descs[13];</span><br><span> const char *gsm_pchan_name(enum gsm_phys_chan_config c);</span><br><span> enum gsm_phys_chan_config gsm_pchan_parse(const char *name);</span><br><span> const char *gsm_lchant_name(enum gsm_chan_t c);</span><br><span>diff --git a/openbsc/src/libbsc/bsc_subscriber.c b/openbsc/src/libbsc/bsc_subscriber.c</span><br><span>index 73e61e8..f4300d7 100644</span><br><span>--- a/openbsc/src/libbsc/bsc_subscriber.c</span><br><span>+++ b/openbsc/src/libbsc/bsc_subscriber.c</span><br><span>@@ -91,6 +91,8 @@</span><br><span>   if (bsub)</span><br><span>            return bsub;</span><br><span>         bsub = bsc_subscr_alloc(list);</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!bsub)</span><br><span style="color: hsl(120, 100%, 40%);">+            return NULL;</span><br><span>         bsc_subscr_set_imsi(bsub, imsi);</span><br><span>     return bsub;</span><br><span> }</span><br><span>@@ -103,6 +105,8 @@</span><br><span>      if (bsub)</span><br><span>            return bsub;</span><br><span>         bsub = bsc_subscr_alloc(list);</span><br><span style="color: hsl(120, 100%, 40%);">+        if (!bsub)</span><br><span style="color: hsl(120, 100%, 40%);">+            return NULL;</span><br><span>         bsub->tmsi = tmsi;</span><br><span>        return bsub;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/openbsc/+/17917">change 17917</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/openbsc/+/17917"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0e9596c3ef26231999c729b5cc408fcaca3790fc </div>
<div style="display:none"> Gerrit-Change-Number: 17917 </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-MessageType: newchange </div>