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>
René Scharfe committed
Sep 7, 2014 at 09:06 UTC
415792edf51b2f87a58a942016a24a2e86a4218b
3 files changed
+6
-13
graph.c
+2
-3
@@ -1145,7 +1145,7 @@ int graph_next_line(struct git_graph *graph, struct strbuf *sb)
1145
1146
static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
1147
{
1148
- int i, j;
1148
+ int i;
1149
1150
if (graph->state != GRAPH_COMMIT) {
1151
graph_next_line(graph, sb);
@@ -1169,8 +1169,7 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
1169
strbuf_addch(sb, ' ');
1170
else {
1171
int num_spaces = ((graph->num_parents - 2) * 2);
1172
- for (j = 0; j < num_spaces; j++)
1173
- strbuf_addch(sb, ' ');
1172
+ strbuf_addchars(sb, ' ', num_spaces);
1173
}
1174
} else {
1175
strbuf_write_column(sb, col, '|');
merge-recursive.c
+1
-3
@@ -163,9 +163,7 @@ static void output(struct merge_options *o, int v, const char *fmt, ...)
163
if (!show(o, v))
164
return;
165
166
- strbuf_grow(&o->obuf, o->call_depth * 2 + 2);
167
- memset(o->obuf.buf + o->obuf.len, ' ', o->call_depth * 2);
168
- strbuf_setlen(&o->obuf, o->obuf.len + o->call_depth * 2);
166
+ strbuf_addchars(&o->obuf, ' ', o->call_depth * 2);
167
168
va_start(ap, fmt);
169
strbuf_vaddf(&o->obuf, fmt, ap);
pretty.c
+3
-7
@@ -1400,9 +1400,7 @@ static size_t format_and_pad_commit(struct strbuf *sb, /* in UTF-8 */
1400
* convert it back to chars
1401
*/
1402
padding = padding - len + local_sb.len;
1403
- strbuf_grow(sb, padding);
1404
- strbuf_setlen(sb, sb_len + padding);
1405
- memset(sb->buf + sb_len, ' ', sb->len - sb_len);
1403
+ strbuf_addchars(sb, ' ', padding);
1404
memcpy(sb->buf + sb_len + offset, local_sb.buf,
1405
local_sb.len);
1406
}
@@ -1679,10 +1677,8 @@ void pp_remainder(struct pretty_print_context *pp,
1677
first = 0;
1678
1679
strbuf_grow(sb, linelen + indent + 20);
1682
- if (indent) {
1683
- memset(sb->buf + sb->len, ' ', indent);
1684
- strbuf_setlen(sb, sb->len + indent);
1685
- }
1680
+ if (indent)
1681
+ strbuf_addchars(sb, ' ', indent);
1682
strbuf_add(sb, line, linelen);
1683
strbuf_addch(sb, '\n');
1684
}