kc3-lang/gnulib/lib/xstring-desc.c

• Show log

  Commit

• Hash : 9a26e704
  Author :
  Date : 2025-01-02T13:54:54
  

  string-desc, xstring-desc, string-desc-quotearg: Rename functions.
  
  * lib/string-desc.h (sd_equals): Renamed from string_desc_equals.
  (sd_startswith): Renamed from string_desc_startswith.
  (sd_endswith): Renamed from string_desc_endswith.
  (sd_cmp): Renamed from string_desc_cmp.
  (sd_c_casecmp): Renamed from string_desc_c_casecmp.
  (sd_index): Renamed from string_desc_index.
  (sd_last_index): Renamed from string_desc_last_index.
  (sd_contains): Renamed from string_desc_contains.
  (sd_new_empty): Renamed from string_desc_new_empty.
  (sd_new_addr): Renamed from string_desc_new_addr.
  (sd_from_c): Renamed from string_desc_from_c.
  (sd_substring): Renamed from string_desc_substring.
  (sd_write): Renamed from string_desc_write.
  (sd_fwrite): Renamed from string_desc_fwrite.
  (sd_new): Renamed from string_desc_new.
  (sd_new_filled): Renamed from string_desc_new_filled.
  (sd_copy): Renamed from string_desc_copy.
  (sd_concat): Renamed from string_desc_concat.
  (sd_c): Renamed from string_desc_c.
  (sd_set_char_at): Renamed from string_desc_set_char_at.
  (sd_fill): Renamed from string_desc_fill.
  (sd_overwrite): Renamed from string_desc_overwrite.
  (sd_free): Renamed from string_desc_free.
  (sd_length): Renamed from string_desc_length.
  (sd_char_at): Renamed from string_desc_char_at.
  (sd_data): Renamed from string_desc_data.
  (sd_is_empty): Renamed from string_desc_is_empty.
  * lib/string-desc.c (sd_equals): Renamed from string_desc_equals.
  (sd_startswith): Renamed from string_desc_startswith.
  (sd_endswith): Renamed from string_desc_endswith.
  (sd_cmp): Renamed from string_desc_cmp.
  (sd_c_casecmp): Renamed from string_desc_c_casecmp.
  (sd_index): Renamed from string_desc_index.
  (sd_last_index): Renamed from string_desc_last_index.
  (sd_new_empty): Renamed from string_desc_new_empty.
  (sd_new_addr): Renamed from string_desc_new_addr.
  (sd_from_c): Renamed from string_desc_from_c.
  (sd_substring): Renamed from string_desc_substring.
  (sd_write): Renamed from string_desc_write.
  (sd_fwrite): Renamed from string_desc_fwrite.
  (sd_new): Renamed from string_desc_new.
  (sd_new_filled): Renamed from string_desc_new_filled.
  (sd_copy): Renamed from string_desc_copy.
  (sd_concat): Renamed from string_desc_concat.
  (sd_c): Renamed from string_desc_c.
  (sd_set_char_at): Renamed from string_desc_set_char_at.
  (sd_fill): Renamed from string_desc_fill.
  (sd_overwrite): Renamed from string_desc_overwrite.
  (sd_free): Renamed from string_desc_free.
  * lib/xstring-desc.h (xsd_concat): Renamed from xstring_desc_concat.
  (xsd_new): Renamed from xstring_desc_new.
  (xsd_new_filled): Renamed from xstring_desc_new_filled.
  (xsd_copy): Renamed from xstring_desc_copy.
  (xsd_c): Renamed from xstring_desc_c.
  * lib/xstring-desc.c (xsd_concat): Renamed from xstring_desc_concat.
  * lib/string-desc-quotearg.h (sd_quotearg_buffer): Renamed from
  string_desc_quotearg_buffer.
  (sd_quotearg_alloc): Renamed from string_desc_quotearg_alloc.
  (sd_quotearg_n): Renamed from string_desc_quotearg_n.
  (sd_quotearg): Renamed from string_desc_quotearg.
  (sd_quotearg_n_style): Renamed from string_desc_quotearg_n_style.
  (sd_quotearg_style): Renamed from string_desc_quotearg_style.
  (sd_quotearg_char): Renamed from string_desc_quotearg_char.
  (sd_quotearg_colon): Renamed from string_desc_quotearg_colon.
  (sd_quotearg_n_custom): Renamed from string_desc_quotearg_n_custom.
  (sd_quotearg_custom): Renamed from sd_quotearg_n_custom.
  * lib/string-desc-contains.c (sd_contains): Renamed from
  string_desc_contains.
  * lib/string-buffer.h: Update.
  * lib/string-buffer.c (sb_append_desc, sb_contents, sb_dupfree): Update.
  * lib/xstring-buffer.c (sb_xdupfree): Update.
  * lib/sf-istream.c (sf_istream_init_from_string_desc): Update.
  * tests/test-string-desc.c (main): Update.
  * tests/test-string-desc.sh: Update.
  * tests/test-xstring-desc.c (main): Update.
  * tests/test-string-desc-quotearg.c (main): Update.
  * tests/test-string-buffer.c (main): Update.
  * tests/test-sf-istream.c (main): Update.
  * tests/test-sfl-istream.c (main): Update.
  * doc/string-desc.texi: Update.
  * doc/strings.texi: Update.
  * NEWS: Mention the change.
  

Download

• lib/xstring-desc.c

• /* String descriptors, with out-of-memory checking.
     Copyright (C) 2023-2025 Free Software Foundation, Inc.
  
     This file 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 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 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>
  
  #define GL_XSTRING_DESC_INLINE _GL_EXTERN_INLINE
  #include "xstring-desc.h"
  
  #include "ialloc.h"
  
  string_desc_t
  xsd_concat (idx_t n, string_desc_t string1, ...)
  {
    if (n <= 0)
      /* Invalid argument.  */
      abort ();
  
    idx_t total = 0;
    total += string1._nbytes;
    if (n > 1)
      {
        va_list other_strings;
        idx_t i;
  
        va_start (other_strings, string1);
        for (i = n - 1; i > 0; i--)
          {
            string_desc_t arg = va_arg (other_strings, string_desc_t);
            total += arg._nbytes;
          }
        va_end (other_strings);
      }
  
    char *combined = (char *) imalloc (total);
    if (combined == NULL)
      xalloc_die ();
    idx_t pos = 0;
    memcpy (combined, string1._data, string1._nbytes);
    pos += string1._nbytes;
    if (n > 1)
      {
        va_list other_strings;
        idx_t i;
  
        va_start (other_strings, string1);
        for (i = n - 1; i > 0; i--)
          {
            string_desc_t arg = va_arg (other_strings, string_desc_t);
            if (arg._nbytes > 0)
              memcpy (combined + pos, arg._data, arg._nbytes);
            pos += arg._nbytes;
          }
        va_end (other_strings);
      }
  
    string_desc_t result;
    result._nbytes = total;
    result._data = combined;
  
    return result;
  }
  

Download