summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/pmdk/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/pmdk/files')
-rw-r--r--meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch47
-rw-r--r--meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch26
2 files changed, 0 insertions, 73 deletions
diff --git a/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch b/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch
deleted file mode 100644
index 8e2b3c7cbb..0000000000
--- a/meta-oe/recipes-extended/pmdk/files/0001-examples-Initialize-child_idx.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 721a48e5397bd4ab454482041e55671eae7b189f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 11 May 2020 18:01:11 -0700
4Subject: [PATCH] examples: Initialize child_idx
5
6Assign UINT_MAX and assert it
7
8Fixes warning
9rtree_map.c:358:12: error: 'child_idx' may be used uninitialized
10in this function [-Werror=maybe-uninitialized]
11
12Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/4802]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/examples/libpmemobj/tree_map/rtree_map.c | 4 +++-
16 1 file changed, 3 insertions(+), 1 deletion(-)
17
18diff --git a/src/examples/libpmemobj/tree_map/rtree_map.c b/src/examples/libpmemobj/tree_map/rtree_map.c
19index 995e22bb9..6b3ead65c 100644
20--- a/src/examples/libpmemobj/tree_map/rtree_map.c
21+++ b/src/examples/libpmemobj/tree_map/rtree_map.c
22@@ -8,6 +8,7 @@
23 #include <ex_common.h>
24 #include <assert.h>
25 #include <errno.h>
26+#include <limits.h>
27 #include <stdlib.h>
28 #include <stdbool.h>
29
30@@ -320,12 +321,13 @@ has_only_one_child(TOID(struct tree_map_node) node, unsigned *child_idx)
31 static void
32 remove_extra_node(TOID(struct tree_map_node) *node)
33 {
34- unsigned child_idx;
35+ unsigned child_idx = UINT_MAX;
36 TOID(struct tree_map_node) tmp, tmp_child;
37
38 /* Our node has child with only one child. */
39 tmp = *node;
40 has_only_one_child(tmp, &child_idx);
41+ assert(child_idx != UINT_MAX);
42 tmp_child = D_RO(tmp)->slots[child_idx];
43
44 /*
45--
462.26.2
47
diff --git a/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch b/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch
deleted file mode 100644
index 82b96cf95e..0000000000
--- a/meta-oe/recipes-extended/pmdk/files/0002-Makefile-Don-t-install-the-docs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 3863d8bd71d6a5638cf984f8d8f9cccac0c7f2a4 Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair.francis@wdc.com>
3Date: Mon, 23 Jul 2018 11:31:17 -0700
4Subject: [PATCH] Makefile: Don't install the docs
5
6Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
7Upstream-Status: Inappropriate [disable feature]
8---
9 Makefile | 1 -
10 1 file changed, 1 deletion(-)
11
12diff --git a/Makefile b/Makefile
13index 47a447f12..7c0f9848f 100644
14--- a/Makefile
15+++ b/Makefile
16@@ -148,7 +148,6 @@ rpm dpkg: pkg-clean
17
18 install uninstall:
19 $(MAKE) -C src $@
20- $(MAKE) -C doc $@
21
22 .PHONY: all clean clobber test check cstyle check-license install uninstall\
23 source rpm dpkg pkg-clean pcheck check-remote format doc require-rpmem\
24--
252.14.4
26