summaryrefslogtreecommitdiff
path: root/gl/lib/regexec.c.diff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2012-07-27 12:15:32 +0200
committerJim Meyering <meyering@redhat.com>2012-07-27 12:15:32 +0200
commit74a1c058753faa79caff061407925463375ba5f3 (patch)
treeec3645967e0584739433c7bc2ede2928486910d6 /gl/lib/regexec.c.diff
parenta6e8e3a3e116f2cdaa452eb66032d912092d0026 (diff)
downloadcoreutils-74a1c058753faa79caff061407925463375ba5f3.tar.xz
maint: refresh stale local gnulib patch files
We carry local adjustments for a few gnulib modules via the patches in gl/. Nearly all of those patches had become stale due to evolution of the originals in gnulib. To refresh them, first make sure you have no local changes in gl/ or in the gnulib submodule, then run "make refresh-gnulib-patches".
Diffstat (limited to 'gl/lib/regexec.c.diff')
-rw-r--r--gl/lib/regexec.c.diff12
1 files changed, 6 insertions, 6 deletions
diff --git a/gl/lib/regexec.c.diff b/gl/lib/regexec.c.diff
index d9b6d1cd5..897d24839 100644
--- a/gl/lib/regexec.c.diff
+++ b/gl/lib/regexec.c.diff
@@ -1,17 +1,17 @@
diff --git a/lib/regexec.c b/lib/regexec.c
-index 21a8166..7762437 100644
+index 7d130a0..a58d454 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
-@@ -18,6 +18,8 @@
- with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+@@ -16,6 +16,8 @@
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
+#include "verify.h"
+#include "intprops.h"
static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
Idx n) internal_function;
static void match_ctx_clean (re_match_context_t *mctx) internal_function;
-@@ -378,8 +380,11 @@ re_search_2_stub (struct re_pattern_buffer *bufp,
+@@ -374,8 +376,11 @@ re_search_2_stub (struct re_pattern_buffer *bufp,
Idx len = length1 + length2;
char *s = NULL;
@@ -25,7 +25,7 @@ index 21a8166..7762437 100644
/* Concatenate the strings. */
if (length2 > 0)
-@@ -431,11 +436,14 @@ re_search_stub (struct re_pattern_buffer *bufp,
+@@ -426,11 +431,14 @@ re_search_stub (struct re_pattern_buffer *bufp,
Idx last_start = start + range;
/* Check for out-of-range. */