kc3-lang/gnulib/lib/propername-lite.c

• Show log

  Commit

• Hash : 012cf99f
  Author :
  Date : 2025-09-05T15:18:31
  

  dfa, propername-lite, quotearg: prefer mbszero
  
  Problem reported by Collin Funk in:
  https://lists.gnu.org/r/bug-gnulib/2025-09/msg00063.html
  * lib/dfa.c (mbszero) [GAWK]: Omit unnecessary parens.
  * lib/localeinfo.c (mbszero) [GAWK]: New macro, copied from dfa.c.
  (is_using_utf8, init_localeinfo): Use it.
  * lib/propername-lite.c (proper_name_lite):
  * lib/quotearg.c (gettext_quote):
  Prefer mbszero to initializing the entire mbstate_t.
  

Download

• lib/propername-lite.c

• /* Localization of proper names.
     Copyright 2023-2025 Free Software Foundation, Inc.
  
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
  
     This program 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 General Public License for more details.
  
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
  
  #include <config.h>
  
  /* Specification.  */
  #include "propername.h"
  
  #include "gettext.h"
  
  #if HAVE_UCHAR_H
  # include <uchar.h>
  /* There is no need for the dependency hassle of replacing glibc mbrtoc32,
     as we don't care whether the C locale treats a byte with the high
     bit set as an encoding error.  */
  # ifdef __GLIBC__
  #  undef mbrtoc32
  # endif
  #endif
  
  /* Return the localization of the name spelled NAME_ASCII in ASCII,
     and NAME_UTF8 in UTF-8.  */
  
  char const *
  proper_name_lite (char const *name_ascii, _GL_UNUSED char const *name_utf8)
  {
    char const *translation = gettext (name_ascii);
    if (translation != name_ascii)
      return translation;
  
  #if HAVE_UCHAR_H
    /* If DF BF decodes to 07FF, assume it is UTF-8.  */
    static char const utf07FF[] = { 0xDF, 0xBF };
    char32_t w;
    mbstate_t mbs; mbszero (&mbs);
    if (mbrtoc32 (&w, utf07FF, 2, &mbs) == 2 && w == 0x07FF)
      return name_utf8;
  #endif
  
    return name_ascii;
  }
  

Download