From f5046759cdd72daf5ba3b31c9dfc7b8d5be6bc9b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Sep 2009 23:46:23 +0200
Subject: llvm-clang-analyzer: drop a few unnecessary assignments and other
 trivial fixes

---
 src/pulsecore/memtrap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/pulsecore/memtrap.c')

diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index c647e507..373872c1 100644
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -200,13 +200,13 @@ pa_memtrap *pa_memtrap_update(pa_memtrap *m, const void *start, size_t size) {
         goto unlock;
 
     memtrap_unlink(m, j);
-    j = pa_aupdate_write_swap(aupdate);
+    pa_aupdate_write_swap(aupdate);
 
     m->start = (void*) start;
     m->size = size;
     pa_atomic_store(&m->bad, 0);
 
-    j = pa_aupdate_write_swap(aupdate);
+    pa_assert_se(pa_aupdate_write_swap(aupdate) == j);
     memtrap_link(m, j);
 
 unlock:
-- 
cgit 


From 996051ebc1883aa335c41a64217794915089a966 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 19 Sep 2009 00:21:34 +0200
Subject: memtrap: properly add items to linked list

---
 src/pulsecore/memtrap.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/pulsecore/memtrap.c')

diff --git a/src/pulsecore/memtrap.c b/src/pulsecore/memtrap.c
index 373872c1..4fc18210 100644
--- a/src/pulsecore/memtrap.c
+++ b/src/pulsecore/memtrap.c
@@ -107,7 +107,10 @@ static void memtrap_link(pa_memtrap *m, unsigned j) {
     pa_assert(m);
 
     m->prev[j] = NULL;
-    m->next[j] = memtraps[j];
+
+    if ((m->next[j] = memtraps[j]))
+        m->next[j]->prev[j] = m;
+
     memtraps[j] = m;
 }
 
-- 
cgit