diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-11 13:54:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-12-12 18:10:22 +0000 |
| commit | a46133082b8c524a57bcb6282c000e417478a90c (patch) | |
| tree | 8bb23bd2fe9546b907fe11b23efdad1058e1ef5a /meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch | |
| parent | 3c1c16b96d2bd032d4114484403ee982927360e8 (diff) | |
| download | poky-a46133082b8c524a57bcb6282c000e417478a90c.tar.gz | |
puzzles: Upgrade to latest git with patches merged
This upgrades to the latest upstream version where our fixes have equivalent
fixes merged upstream so our patches are no longer needed.
(From OE-Core rev: 987077008c89a9086247d5bcdf35aef7413fb954)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch')
| -rw-r--r-- | meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch b/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch deleted file mode 100644 index b182240240..0000000000 --- a/meta/recipes-sato/puzzles/files/fix-ki-uninitialized.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | tree123: avoid compiler unitialized variable error | ||
| 2 | |||
| 3 | The compiler does not realize that we must go through the while() | ||
| 4 | loop at least once, so we replace it with a for() loop. | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [email discussion with upstream] | ||
| 7 | |||
| 8 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
| 9 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
| 10 | |||
| 11 | Index: git/tree234.c | ||
| 12 | =================================================================== | ||
| 13 | --- git.orig/tree234.c | ||
| 14 | +++ git/tree234.c | ||
| 15 | @@ -335,7 +335,7 @@ static void *add234_internal(tree234 *t, | ||
| 16 | } | ||
| 17 | |||
| 18 | n = t->root; | ||
| 19 | - while (n) { | ||
| 20 | + do { | ||
| 21 | LOG((" node %p: %p/%d \"%s\" %p/%d \"%s\" %p/%d \"%s\" %p/%d\n", | ||
| 22 | n, | ||
| 23 | n->kids[0], n->counts[0], n->elems[0], | ||
| 24 | @@ -388,7 +388,7 @@ static void *add234_internal(tree234 *t, | ||
| 25 | if (!n->kids[ki]) | ||
| 26 | break; | ||
| 27 | n = n->kids[ki]; | ||
| 28 | - } | ||
| 29 | + } while (n); | ||
| 30 | |||
| 31 | add234_insert(NULL, e, NULL, &t->root, n, ki); | ||
| 32 | |||
