1
0
mirror of https://github.com/git/git.git synced 2024-11-08 15:19:28 +01:00

strbuf: introduce strbuf_addstrings() to repeatedly add a string

In a following commit we are going to port code from
"t/helper/test-sha256.c", t/helper/test-hash.c and "t/t0015-hash.sh" to
a new "t/unit-tests/t-hash.c" file using the recently added unit test
framework.

To port code like: perl -e "$| = 1; print q{aaaaaaaaaa} for 1..100000;"
we are going to need a new strbuf_addstrings() function that repeatedly
adds the same string a number of times to a buffer.

Such a strbuf_addstrings() function would already be useful in
"json-writer.c" and "builtin/submodule-helper.c" as both of these files
already have code that repeatedly adds the same string. So let's
introduce such a strbuf_addstrings() function in "strbuf.{c,h}" and use
it in both "json-writer.c" and "builtin/submodule-helper.c".

We use the "strbuf_addstrings" name as this way strbuf_addstr() and
strbuf_addstrings() would be similar for strings as strbuf_addch() and
strbuf_addchars() for characters.

Helped-by: Junio C Hamano <gitster@pobox.com>
Mentored-by: Christian Couder <chriscool@tuxfamily.org>
Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
Co-authored-by: Achu Luma <ach.lumap@gmail.com>
Signed-off-by: Achu Luma <ach.lumap@gmail.com>
Signed-off-by: Ghanshyam Thakkar <shyamthakkar001@gmail.com>
Acked-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ghanshyam Thakkar 2024-05-29 13:30:29 +05:30 committed by Junio C Hamano
parent 786a3e4b8d
commit a70f8f19ad
4 changed files with 16 additions and 7 deletions

@ -257,11 +257,9 @@ static void module_list_active(struct module_list *list)
static char *get_up_path(const char *path) static char *get_up_path(const char *path)
{ {
int i;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
for (i = count_slashes(path); i; i--) strbuf_addstrings(&sb, "../", count_slashes(path));
strbuf_addstr(&sb, "../");
/* /*
* Check if 'path' ends with slash or not * Check if 'path' ends with slash or not

@ -46,10 +46,7 @@ static void append_quoted_string(struct strbuf *out, const char *in)
static void indent_pretty(struct json_writer *jw) static void indent_pretty(struct json_writer *jw)
{ {
int k; strbuf_addstrings(&jw->json, " ", jw->open_stack.len);
for (k = 0; k < jw->open_stack.len; k++)
strbuf_addstr(&jw->json, " ");
} }
/* /*

@ -313,6 +313,15 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len)
strbuf_setlen(sb, sb->len + len); strbuf_setlen(sb, sb->len + len);
} }
void strbuf_addstrings(struct strbuf *sb, const char *s, size_t n)
{
size_t len = strlen(s);
strbuf_grow(sb, st_mult(len, n));
for (size_t i = 0; i < n; i++)
strbuf_add(sb, s, len);
}
void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2)
{ {
strbuf_grow(sb, sb2->len); strbuf_grow(sb, sb2->len);

@ -310,6 +310,11 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s)
strbuf_add(sb, s, strlen(s)); strbuf_add(sb, s, strlen(s));
} }
/**
* Add a NUL-terminated string the specified number of times to the buffer.
*/
void strbuf_addstrings(struct strbuf *sb, const char *s, size_t n);
/** /**
* Copy the contents of another buffer at the end of the current one. * Copy the contents of another buffer at the end of the current one.
*/ */