1
0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-08-13 13:45:55 +02:00

maint: prefer mcel_eq to mcel_cmp

* gnulib: Update submodule to latest.
* bootstrap: Run ./bootstrap --bootstrap-sync
* src/expr.c (mbs_logical_cspn): Use mcel_eq instead of mcel_cmp.
* src/join.c (eq_tab, main): Likewise.
This commit is contained in:
Collin Funk
2025-11-27 12:14:53 -08:00
parent 194176cddb
commit 8083efff09
4 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
# A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
scriptlibversion=2025-09-07.23; # UTC
scriptlibversion=2025-11-12.14; # UTC
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
#
@@ -861,7 +861,7 @@ autopull()
elif check_exists git-merge-changelog; then
echo "$0: initializing git-merge-changelog driver"
git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B "%Y"'
else
echo "$0: consider installing git-merge-changelog from gnulib"
fi
+1 -1
Submodule gnulib updated: 814a1087ca...27b1797939
+1 -1
View File
@@ -136,7 +136,7 @@ mbs_logical_cspn (char const *s, char const *accept)
for (char const *a = accept; *a; )
{
mcel_t h = mcel_scanz (a);
if (mcel_cmp (g, h) == 0)
if (mcel_eq (g, h))
return idx;
a += h.len;
}
+2 -2
View File
@@ -274,7 +274,7 @@ extract_field (struct line *line, char *field, idx_t len)
static bool
eq_tab (mcel_t g)
{
return mcel_cmp (g, tab) == 0;
return mcel_eq (g, tab);
}
static bool
@@ -1116,7 +1116,7 @@ main (int argc, char **argv)
quote (optarg));
output_separator = optarg;
}
if (tab.len && mcel_cmp (tab, newtab) != 0)
if (tab.len && ! mcel_eq (tab, newtab))
error (EXIT_FAILURE, 0, _("incompatible tabs"));
tab = newtab;
output_seplen = newtab.len;