Change in openbsc[master]: fix compilation with gcc-10

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/openbsc/+/17917 )


Change subject: fix compilation with gcc-10
......................................................................

fix compilation with gcc-10

See also: https://alioth-lists.debian.net/pipermail/debian-mobcom-maintainers/Week-of-Mon-20200413/000648.html

Change-Id: I0e9596c3ef26231999c729b5cc408fcaca3790fc
---
M openbsc/include/openbsc/gsm_data_shared.h
M openbsc/src/libbsc/bsc_subscriber.c
2 files changed, 8 insertions(+), 4 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/17/17917/1

diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index e616c12..23acf2f 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -379,13 +379,13 @@
 #endif
 };
 
-enum {
+enum gsm_bts_trx_ts_flags {
 	TS_F_PDCH_ACTIVE =		0x1000,
 	TS_F_PDCH_ACT_PENDING =		0x2000,
 	TS_F_PDCH_DEACT_PENDING =	0x4000,
 	TS_F_PDCH_PENDING_MASK =	0x6000 /*<
 			TS_F_PDCH_ACT_PENDING | TS_F_PDCH_DEACT_PENDING */
-} gsm_bts_trx_ts_flags;
+};
 
 /* One Timeslot in a TRX */
 struct gsm_bts_trx_ts {
@@ -945,8 +945,8 @@
 const char *btsvariant2str(enum gsm_bts_type_variant v);
 
 extern const struct value_string gsm_chreq_descs[];
-const struct value_string gsm_pchant_names[13];
-const struct value_string gsm_pchant_descs[13];
+extern const struct value_string gsm_pchant_names[13];
+extern const struct value_string gsm_pchant_descs[13];
 const char *gsm_pchan_name(enum gsm_phys_chan_config c);
 enum gsm_phys_chan_config gsm_pchan_parse(const char *name);
 const char *gsm_lchant_name(enum gsm_chan_t c);
diff --git a/openbsc/src/libbsc/bsc_subscriber.c b/openbsc/src/libbsc/bsc_subscriber.c
index 73e61e8..f4300d7 100644
--- a/openbsc/src/libbsc/bsc_subscriber.c
+++ b/openbsc/src/libbsc/bsc_subscriber.c
@@ -91,6 +91,8 @@
 	if (bsub)
 		return bsub;
 	bsub = bsc_subscr_alloc(list);
+	if (!bsub)
+		return NULL;
 	bsc_subscr_set_imsi(bsub, imsi);
 	return bsub;
 }
@@ -103,6 +105,8 @@
 	if (bsub)
 		return bsub;
 	bsub = bsc_subscr_alloc(list);
+	if (!bsub)
+		return NULL;
 	bsub->tmsi = tmsi;
 	return bsub;
 }

-- 
To view, visit https://gerrit.osmocom.org/c/openbsc/+/17917
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Change-Id: I0e9596c3ef26231999c729b5cc408fcaca3790fc
Gerrit-Change-Number: 17917
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200420/918d7639/attachment.htm>