fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31939 )
Change subject: fix bs11_read_swl_file(): properly clean up stale file list
......................................................................
fix bs11_read_swl_file(): properly clean up stale file list
Calling talloc_free() on struct llist_head is wrong and will lead
to unexpected behavior. Call it on the containing struct instead.
Change-Id: Ib5eaa328aaf6881ae9621ca14859e4e255af2b00
---
M src/osmo-bsc/abis_nm.c
1 file changed, 15 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/39/31939/1
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 938f45d..95cb858 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -2645,8 +2645,8 @@
static int bs11_read_swl_file(struct abis_nm_bs11_sw *bs11_sw)
{
+ struct file_list_entry *fle;
char linebuf[255];
- struct llist_head *lh, *lh2;
FILE *swl;
int rc = 0;
@@ -2655,10 +2655,8 @@
return -ENODEV;
/* zero the stale file list, if any */
- llist_for_each_safe(lh, lh2, &bs11_sw->file_list) {
- llist_del(lh);
- talloc_free(lh);
- }
+ while ((fle = fl_dequeue(&bs11_sw->file_list)))
+ talloc_free(fle);
while (fgets(linebuf, sizeof(linebuf), swl)) {
char file_id[12+1];
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31939
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib5eaa328aaf6881ae9621ca14859e4e255af2b00
Gerrit-Change-Number: 31939
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/gapk/+/31938 )
Change subject: src/Makefile.am: fix building with --enable-gsmhr
......................................................................
src/Makefile.am: fix building with --enable-gsmhr
In change [1] I moved libraries from _LDFLAGS to _LIBADD, but I did
not notice that there was another problem: when building with gsmhr,
the content of _LIBADD gets overwritten in a conditional block.
Do not overwrite but append libgsmhr.la to _LIBADD.
Change-Id: Ib46b1f6555b13e0937a8d6fe6e2ad70ed9d06d58
Fixes: [1] 08c1edb986cc9ae9cbabe0973cc61309025f4e7f
---
M src/Makefile.am
1 file changed, 17 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/38/31938/1
diff --git a/src/Makefile.am b/src/Makefile.am
index 9cbe492..550e3b8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@
$(NULL)
if ENABLE_GSMHR
-libosmogapk_la_LIBADD = $(top_builddir)/libgsmhr/libgsmhr.la
+libosmogapk_la_LIBADD += $(top_builddir)/libgsmhr/libgsmhr.la
endif
# Processing queue implementation
--
To view, visit https://gerrit.osmocom.org/c/gapk/+/31938
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: gapk
Gerrit-Branch: master
Gerrit-Change-Id: Ib46b1f6555b13e0937a8d6fe6e2ad70ed9d06d58
Gerrit-Change-Number: 31938
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/31932 )
Change subject: obs: don't pass meta through functions
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31932
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ieb49e5f8630e3e918b11a7a225febbbcee2e82b3
Gerrit-Change-Number: 31932
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Wed, 15 Mar 2023 18:13:34 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment