Branch
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104
/* Test of string descriptors.
Copyright (C) 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/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2023. */
#include <config.h>
#include "string-desc-quotearg.h"
#include <stdlib.h>
#include <string.h>
#include "macros.h"
int
main (void)
{
string_desc_t s1 = sd_from_c ("Hello world!");
string_desc_t s2 = sd_new_addr (21, "The\0quick\0brown\0\0fox");
/* Test sd_quotearg_buffer. */
{
char buf[80];
size_t n = sd_quotearg_buffer (buf, sizeof (buf), s2, NULL);
ASSERT (n == 21);
ASSERT (memcmp (buf, "The\0quick\0brown\0\0fox", n) == 0);
}
/* Test sd_quotearg_alloc. */
{
size_t n;
char *ret = sd_quotearg_alloc (s2, &n, NULL);
ASSERT (n == 21);
ASSERT (memcmp (ret, "The\0quick\0brown\0\0fox", n) == 0);
free (ret);
}
/* Test sd_quotearg_n. */
{
char *ret = sd_quotearg_n (1, s2);
ASSERT (memcmp (ret, "Thequickbrownfox", 16 + 1) == 0);
}
/* Test sd_quotearg. */
{
char *ret = sd_quotearg (s2);
ASSERT (memcmp (ret, "Thequickbrownfox", 16 + 1) == 0);
}
/* Test sd_quotearg_n_style. */
{
char *ret = sd_quotearg_n_style (1, clocale_quoting_style, s2);
ASSERT (memcmp (ret, "\"The\\0quick\\0brown\\0\\0fox\\0\"", 28 + 1) == 0
|| /* if the locale has UTF-8 encoding */
memcmp (ret, "\342\200\230The\\0quick\\0brown\\0\\0fox\\0\342\200\231", 32 + 1) == 0);
}
/* Test sd_quotearg_style. */
{
char *ret = sd_quotearg_style (clocale_quoting_style, s2);
ASSERT (memcmp (ret, "\"The\\0quick\\0brown\\0\\0fox\\0\"", 28 + 1) == 0
|| /* if the locale has UTF-8 encoding */
memcmp (ret, "\342\200\230The\\0quick\\0brown\\0\\0fox\\0\342\200\231", 32 + 1) == 0);
}
/* Test sd_quotearg_char. */
{
char *ret = sd_quotearg_char (s1, ' ');
ASSERT (memcmp (ret, "Hello world!", 12 + 1) == 0); /* ' ' not quoted?! */
}
/* Test sd_quotearg_colon. */
{
char *ret = sd_quotearg_colon (sd_from_c ("a:b"));
ASSERT (memcmp (ret, "a:b", 3 + 1) == 0); /* ':' not quoted?! */
}
/* Test sd_quotearg_n_custom. */
{
char *ret = sd_quotearg_n_custom (2, "<", ">", s1);
ASSERT (memcmp (ret, "<Hello world!>", 14 + 1) == 0);
}
/* Test sd_quotearg_n_custom. */
{
char *ret = sd_quotearg_custom ("[[", "]]", s1);
ASSERT (memcmp (ret, "[[Hello world!]]", 16 + 1) == 0);
}
return test_exit_status;
}