Skip to content

Commit a70f8f1

Browse files
spectre10achluma
authored andcommitted
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 <[email protected]> Mentored-by: Christian Couder <[email protected]> Mentored-by: Kaartic Sivaraam <[email protected]> Co-authored-by: Achu Luma <[email protected]> Signed-off-by: Achu Luma <[email protected]> Signed-off-by: Ghanshyam Thakkar <[email protected]> Acked-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 786a3e4 commit a70f8f1

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

builtin/submodule--helper.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,9 @@ static void module_list_active(struct module_list *list)
257257

258258
static char *get_up_path(const char *path)
259259
{
260-
int i;
261260
struct strbuf sb = STRBUF_INIT;
262261

263-
for (i = count_slashes(path); i; i--)
264-
strbuf_addstr(&sb, "../");
262+
strbuf_addstrings(&sb, "../", count_slashes(path));
265263

266264
/*
267265
* Check if 'path' ends with slash or not

json-writer.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,7 @@ static void append_quoted_string(struct strbuf *out, const char *in)
4646

4747
static void indent_pretty(struct json_writer *jw)
4848
{
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);
5350
}
5451

5552
/*

strbuf.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,15 @@ void strbuf_add(struct strbuf *sb, const void *data, size_t len)
313313
strbuf_setlen(sb, sb->len + len);
314314
}
315315

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+
316325
void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2)
317326
{
318327
strbuf_grow(sb, sb2->len);

strbuf.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,11 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s)
310310
strbuf_add(sb, s, strlen(s));
311311
}
312312

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+
313318
/**
314319
* Copy the contents of another buffer at the end of the current one.
315320
*/

0 commit comments

Comments
 (0)