bootstrap: Fix patching warnings
Currently bootstrap complains in the following way when patching gnulib files: patching file regcomp.c Hunk #2 succeeded at 1029 with fuzz 2. Hunk #5 succeeded at 1716 with fuzz 2. patching file regexec.c patching file base64.c patching file regexec.c Hunk #1 succeeded at 807 (offset -21 lines). Let's fix it by adding missing "\f" and amending line numbers in the patches. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Reviewed-by: Alec Brown <alec.r.brown@oracle.com>
This commit is contained in:
parent
4129e9ad6f
commit
7ded35feaa
@ -50,7 +50,7 @@
|
||||
- return REG_NOERROR;
|
||||
+ return err;
|
||||
}
|
||||
|
||||
|
||||
/* If it is possible to do searching in single byte encoding instead of UTF-8
|
||||
@@ -1677,12 +1677,11 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
|
||||
{
|
||||
@ -106,5 +106,5 @@
|
||||
+
|
||||
+ return err;
|
||||
}
|
||||
|
||||
|
||||
/* Functions for token which are used in the parser. */
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/lib/regexec.c 2020-10-21 14:25:35.310195912 +0000
|
||||
+++ b/lib/regexec.c 2020-10-21 14:32:07.961765604 +0000
|
||||
@@ -828,7 +828,11 @@
|
||||
@@ -807,7 +807,11 @@
|
||||
break;
|
||||
if (__glibc_unlikely (err != REG_NOMATCH))
|
||||
goto free_return;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user