@matheusbsbs / matheus-bagliano / commits / a70f8f19ad

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>

Ghanshyam Thakkar committed May 29, 2024 at 13:30 UTC a70f8f19ad2a147a5bfe764fb99379b8f6cb50a5
4 files changed +16 -7
builtin/submodule--helper.c
+1 -3
@@ -257,11 +257,9 @@ static void module_list_active(struct module_list *list)
257
258 static char *get_up_path(const char *path)
259 {
260 - int i;
260 struct strbuf sb = STRBUF_INIT;
261
263 - for (i = count_slashes(path); i; i--)
264 - strbuf_addstr(&sb, "../");
262 + strbuf_addstrings(&sb, "../", count_slashes(path));
263
264 /*
265 * Check if 'path' ends with slash or not
json-writer.c
+1 -4
@@ -46,10 +46,7 @@ static void append_quoted_string(struct strbuf *out, const char *in)
46
47 static void indent_pretty(struct json_writer *jw)
48 {
49 - int k;
50 -
51 - for (k = 0; k < jw->open_stack.len; k++)
52 - strbuf_addstr(&jw->json, " ");
49 + strbuf_addstrings(&jw->json, " ", jw->open_stack.len);
50 }
51
52 /*
strbuf.c
+9
@@ -313,6 +313,15 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len)
313 strbuf_setlen(sb, sb->len + len);
314 }
315
316 +void strbuf_addstrings(struct strbuf *sb, const char *s, size_t n)
317 +{
318 + size_t len = strlen(s);
319 +
320 + strbuf_grow(sb, st_mult(len, n));
321 + for (size_t i = 0; i < n; i++)
322 + strbuf_add(sb, s, len);
323 +}
324 +
325 void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2)
326 {
327 strbuf_grow(sb, sb2->len);
strbuf.h
+5
@@ -310,6 +310,11 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s)
310 strbuf_add(sb, s, strlen(s));
311 }
312
313 +/**
314 + * Add a NUL-terminated string the specified number of times to the buffer.
315 + */
316 +void strbuf_addstrings(struct strbuf *sb, const char *s, size_t n);
317 +
318 /**
319 * Copy the contents of another buffer at the end of the current one.
320 */