strbuf: use strbuf_addchars() for adding a char multiple times

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/graph.c b/graph.c
index 640433166b39c515746d698566839326d9ce7bbe..dfb99f6436b41f5a567bc7c7a5785588bef15b41 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -1145,7 +1145,7 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb)
 
 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
 {
 
 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
 {

-       int i, j;
+       int i;

 
        if (graph->state != GRAPH_COMMIT) {
                graph_next_line(graph, sb);
 
        if (graph->state != GRAPH_COMMIT) {
                graph_next_line(graph, sb);


@@ -1169,8 +1169,7 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
                                strbuf_addch(sb, ' ');
                        else {
                                int num_spaces = ((graph->num_parents - 2) * 2);
                                strbuf_addch(sb, ' ');
                        else {
                                int num_spaces = ((graph->num_parents - 2) * 2);

-                               for (j = 0; j < num_spaces; j++)
-                                       strbuf_addch(sb, ' ');
+                               strbuf_addchars(sb, ' ', num_spaces);

                        }
                } else {
                        strbuf_write_column(sb, col, '|');
                        }
                } else {
                        strbuf_write_column(sb, col, '|');

diff --git a/merge-recursive.c b/merge-recursive.c
index dbb7104c043b14f2a43d67e1ca87ce88f4a55408..ec0fef8d7d2e5ebb18cfd8ce4468e8f4e94755e1 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -163,9 +163,7 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
        if (!show(o, v))
                return;
 
        if (!show(o, v))
                return;
 

-       strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
-       memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
-       strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
+       strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);

 
        va_start(ap, fmt);
        strbuf_vaddf(&o->obuf, fmt, ap);
 
        va_start(ap, fmt);
        strbuf_vaddf(&o->obuf, fmt, ap);

diff --git a/pretty.c b/pretty.c
index 296cb5680ac6ba7a7c7670652e9287f56a1c1338..c2198a335f56a1737799cee112d0f68574d23440 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1400,9 +1400,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
                 * convert it back to chars
                 */
                padding = padding - len + local_sb.len;
                 * convert it back to chars
                 */
                padding = padding - len + local_sb.len;

-               strbuf_grow(sb, padding);
-               strbuf_setlen(sb, sb_len + padding);
-               memset(sb->buf + sb_len, ' ', sb->len - sb_len);
+               strbuf_addchars(sb, ' ', padding);

                memcpy(sb->buf + sb_len + offset, local_sb.buf,
                       local_sb.len);
        }
                memcpy(sb->buf + sb_len + offset, local_sb.buf,
                       local_sb.len);
        }


@@ -1679,10 +1677,8 @@ void pp_remainder(struct pretty_print_context *pp,
                first = 0;
 
                strbuf_grow(sb, linelen + indent + 20);
                first = 0;
 
                strbuf_grow(sb, linelen + indent + 20);

-               if (indent) {
-                       memset(sb->buf + sb->len, ' ', indent);
-                       strbuf_setlen(sb, sb->len + indent);
-               }
+               if (indent)
+                       strbuf_addchars(sb, ' ', indent);

                strbuf_add(sb, line, linelen);
                strbuf_addch(sb, '\n');
        }
                strbuf_add(sb, line, linelen);
                strbuf_addch(sb, '\n');
        }