diff options
Diffstat (limited to 'lib/memcmp2.c')
| -rw-r--r-- | lib/memcmp2.c | 32 | 
1 files changed, 9 insertions, 23 deletions
diff --git a/lib/memcmp2.c b/lib/memcmp2.c index d30d9a2d..57805968 100644 --- a/lib/memcmp2.c +++ b/lib/memcmp2.c @@ -1,24 +1,15 @@  /* Compare two memory areas with possibly different lengths. -   Copyright (C) 2009-2018 Free Software Foundation, Inc. +   Copyright (C) 2009-2022 Free Software Foundation, Inc. -   This program is free software: you can redistribute it and/or -   modify it under the terms of either: +   This file is free software: you can redistribute it and/or modify +   it under the terms of the GNU Lesser General Public License as +   published by the Free Software Foundation; either version 2.1 of the +   License, or (at your option) any later version. -     * the GNU Lesser General Public License as published by the Free -       Software Foundation; either version 3 of the License, or (at your -       option) any later version. - -   or - -     * the GNU General Public License as published by the Free -       Software Foundation; either version 2 of the License, or (at your -       option) any later version. - -   or both in parallel, as here. -   This program is distributed in the hope that it will be useful, +   This file is distributed in the hope that it will be useful,     but WITHOUT ANY WARRANTY; without even the implied warranty of -   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU -   Lesser General Public License for more details. +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the +   GNU Lesser General Public License for more details.     You should have received a copy of the GNU Lesser General Public License     along with this program.  If not, see <https://www.gnu.org/licenses/>.  */ @@ -35,11 +26,6 @@ memcmp2 (const char *s1, size_t n1, const char *s2, size_t n2)  {    int cmp = memcmp (s1, s2, n1 <= n2 ? n1 : n2);    if (cmp == 0) -    { -      if (n1 < n2) -        cmp = -1; -      else if (n1 > n2) -        cmp = 1; -    } +    cmp = _GL_CMP (n1, n2);    return cmp;  }  | 
