From: Seija Kijin <doremylover123@xxxxxxxxx>
Adding the char directly instead of a string of length 2
is clearer and more efficient.
Signed-off-by: Seija Kijin <doremylover123@xxxxxxxxx>
---
git: replace strbuf_addstr with strbuf_addch for all strings of length 2
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1436%2FAreaZR%2Fstrbuf-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1436/AreaZR/strbuf-v4
Pull-Request: https://github.com/git/git/pull/1436
Range-diff vs v3:
1: 96a093dec36 ! 1: 413c5ab1f1b git: replace strbuf_addstr with strbuf_addch for all strings of length 2
@@ bisect.c: static int register_ref(const char *refname, const char *referent UNUS
if (!strcmp(refname, term_bad)) {
free(current_bad_oid);
- ## builtin/am.c ##
-@@ builtin/am.c: static void write_author_script(const struct am_state *state)
-
- strbuf_addstr(&sb, "GIT_AUTHOR_NAME=");
- sq_quote_buf(&sb, state->author_name);
-- strbuf_addch(&sb, '\n');
-
-- strbuf_addstr(&sb, "GIT_AUTHOR_EMAIL=");
-+ strbuf_addstr(&sb, "\nGIT_AUTHOR_EMAIL=");
- sq_quote_buf(&sb, state->author_email);
-- strbuf_addch(&sb, '\n');
-
-- strbuf_addstr(&sb, "GIT_AUTHOR_DATE=");
-+ strbuf_addstr(&sb, "\nGIT_AUTHOR_DATE=");
- sq_quote_buf(&sb, state->author_date);
- strbuf_addch(&sb, '\n');
-
-
- ## builtin/blame.c ##
-@@ builtin/blame.c: static void get_ac_line(const char *inbuf, const char *what,
-
- if (split_ident_line(&ident, tmp, len)) {
- error_out:
-- /* Ugh */
-- tmp = "(unknown)";
-- strbuf_addstr(name, tmp);
-- strbuf_addstr(mail, tmp);
-- strbuf_addstr(tz, tmp);
-+ strbuf_addstr(name, "(unknown)");
-+ strbuf_addstr(mail, "(unknown)");
-+ strbuf_addstr(tz, "(unknown)");
- *time = 0;
- return;
- }
-
## builtin/ls-tree.c ##
@@ builtin/ls-tree.c: static void expand_objectsize(struct strbuf *line, const struct object_id *oid,
} else if (padded) {
@@ builtin/ls-tree.c: static void expand_objectsize(struct strbuf *line, const stru
}
+ ## convert.c ##
+@@ convert.c: static void trace_encoding(const char *context, const char *path,
+ ((i+1) % 8 && (i+1) < len ? ' ' : '\n')
+ );
+ }
+- strbuf_addchars(&trace, '\n', 1);
++ strbuf_addch(&trace, '\n');
+
+ trace_strbuf(&coe, &trace);
+ strbuf_release(&trace);
+
## diff.c ##
@@ diff.c: static void add_line_count(struct strbuf *out, int count)
strbuf_addstr(out, "0,0");
@@ log-tree.c: void fmt_output_subject(struct strbuf *filename,
}
strbuf_addf(filename, "%04d-%s", nr, subject);
+ ## merge-ort.c ##
+@@ merge-ort.c: static void path_msg(struct merge_options *opt,
+
+ va_start(ap, fmt);
+ if (opt->priv->call_depth) {
+- strbuf_addchars(dest, ' ', 2);
++ strbuf_addstr(dest, " ");
+ strbuf_addstr(dest, "From inner merge:");
+ strbuf_addchars(dest, ' ', opt->priv->call_depth * 2);
+ }
+
## path.c ##
@@ path.c: const char *remove_leading_path(const char *in, const char *prefix)
@@ path.c: const char *remove_leading_path(const char *in, const char *prefix)
strbuf_addstr(&buf, in + j);
return buf.buf;
+ ## pretty.c ##
+@@ pretty.c: void pp_user_info(struct pretty_print_context *pp,
+
+ strbuf_addf(sb, "%s: ", what);
+ if (pp->fmt == CMIT_FMT_FULLER)
+- strbuf_addchars(sb, ' ', 4);
++ strbuf_addstr(sb, " ");
+
+ strbuf_addf(&id, "%.*s <%.*s>", (int)namelen, namebuf,
+ (int)maillen, mailbuf);
+
## protocol-caps.c ##
@@ protocol-caps.c: static void send_info(struct repository *r, struct packet_writer *writer,
@@ protocol-caps.c: static void send_info(struct repository *r, struct packet_write
strbuf_addf(&send_buffer, " %lu", object_size);
}
+ ## send-pack.c ##
+@@ send-pack.c: static int generate_push_cert(struct strbuf *req_buf,
+ if (args->push_options)
+ for_each_string_list_item(item, args->push_options)
+ strbuf_addf(&cert, "push-option %s\n", item->string);
+- strbuf_addstr(&cert, "\n");
++ strbuf_addch(&cert, '\n');
+
+ for (ref = remote_refs; ref; ref = ref->next) {
+ if (check_to_send_update(ref, args) < 0)
+
## setup.c ##
@@ setup.c: static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
return GIT_DIR_DISALLOWED_BARE;
bisect.c | 2 +-
builtin/ls-tree.c | 2 +-
convert.c | 2 +-
diff.c | 2 +-
log-tree.c | 2 +-
merge-ort.c | 2 +-
path.c | 2 +-
pretty.c | 2 +-
protocol-caps.c | 2 +-
send-pack.c | 2 +-
setup.c | 2 +-
trace2/tr2_tgt_normal.c | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/bisect.c b/bisect.c
index d71c4e4b44b..94bb53c9bf6 100644
--- a/bisect.c
+++ b/bisect.c
@@ -454,7 +454,7 @@ static int register_ref(const char *refname, const char *referent UNUSED, const
{
struct strbuf good_prefix = STRBUF_INIT;
strbuf_addstr(&good_prefix, term_good);
- strbuf_addstr(&good_prefix, "-");
+ strbuf_addch(&good_prefix, '-');
if (!strcmp(refname, term_bad)) {
free(current_bad_oid);
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 8542b5d53e4..605ddb5a719 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -37,7 +37,7 @@ static void expand_objectsize(struct strbuf *line, const struct object_id *oid,
} else if (padded) {
strbuf_addf(line, "%7s", "-");
} else {
- strbuf_addstr(line, "-");
+ strbuf_addch(line, '-');
}
}
diff --git a/convert.c b/convert.c
index c9a31eb4f03..3ee5a22b2a8 100644
--- a/convert.c
+++ b/convert.c
@@ -337,7 +337,7 @@ static void trace_encoding(const char *context, const char *path,
((i+1) % 8 && (i+1) < len ? ' ' : '\n')
);
}
- strbuf_addchars(&trace, '\n', 1);
+ strbuf_addch(&trace, '\n');
trace_strbuf(&coe, &trace);
strbuf_release(&trace);
diff --git a/diff.c b/diff.c
index 266ddf18e73..61434c6cb45 100644
--- a/diff.c
+++ b/diff.c
@@ -1763,7 +1763,7 @@ static void add_line_count(struct strbuf *out, int count)
strbuf_addstr(out, "0,0");
break;
case 1:
- strbuf_addstr(out, "1");
+ strbuf_addch(out, '1');
break;
default:
strbuf_addf(out, "1,%d", count);
diff --git a/log-tree.c b/log-tree.c
index 83cc4b1cfb7..d0dc065e4f3 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -452,7 +452,7 @@ void fmt_output_subject(struct strbuf *filename,
strbuf_addf(&temp, "v%s", info->reroll_count);
format_sanitized_subject(filename, temp.buf, temp.len);
- strbuf_addstr(filename, "-");
+ strbuf_addch(filename, '-');
strbuf_release(&temp);
}
strbuf_addf(filename, "%04d-%s", nr, subject);
diff --git a/merge-ort.c b/merge-ort.c
index 11029c10be3..a36c2c936fe 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -827,7 +827,7 @@ static void path_msg(struct merge_options *opt,
va_start(ap, fmt);
if (opt->priv->call_depth) {
- strbuf_addchars(dest, ' ', 2);
+ strbuf_addstr(dest, " ");
strbuf_addstr(dest, "From inner merge:");
strbuf_addchars(dest, ' ', opt->priv->call_depth * 2);
}
diff --git a/path.c b/path.c
index 4dcf3c8d40d..04085c164d0 100644
--- a/path.c
+++ b/path.c
@@ -982,7 +982,7 @@ const char *remove_leading_path(const char *in, const char *prefix)
strbuf_reset(&buf);
if (!in[j])
- strbuf_addstr(&buf, ".");
+ strbuf_addch(&buf, '.');
else
strbuf_addstr(&buf, in + j);
return buf.buf;
diff --git a/pretty.c b/pretty.c
index 098378720a4..84c96fc5a80 100644
--- a/pretty.c
+++ b/pretty.c
@@ -590,7 +590,7 @@ void pp_user_info(struct pretty_print_context *pp,
strbuf_addf(sb, "%s: ", what);
if (pp->fmt == CMIT_FMT_FULLER)
- strbuf_addchars(sb, ' ', 4);
+ strbuf_addstr(sb, " ");
strbuf_addf(&id, "%.*s <%.*s>", (int)namelen, namebuf,
(int)maillen, mailbuf);
diff --git a/protocol-caps.c b/protocol-caps.c
index 855f279c2f7..a841a457bbd 100644
--- a/protocol-caps.c
+++ b/protocol-caps.c
@@ -65,7 +65,7 @@ static void send_info(struct repository *r, struct packet_writer *writer,
if (info->size) {
if (oid_object_info(r, &oid, &object_size) < 0) {
- strbuf_addstr(&send_buffer, " ");
+ strbuf_addch(&send_buffer, ' ');
} else {
strbuf_addf(&send_buffer, " %lu", object_size);
}
diff --git a/send-pack.c b/send-pack.c
index 6677c44e8ac..9eb7cdc6ee7 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -373,7 +373,7 @@ static int generate_push_cert(struct strbuf *req_buf,
if (args->push_options)
for_each_string_list_item(item, args->push_options)
strbuf_addf(&cert, "push-option %s\n", item->string);
- strbuf_addstr(&cert, "\n");
+ strbuf_addch(&cert, '\n');
for (ref = remote_refs; ref; ref = ref->next) {
if (check_to_send_update(ref, args) < 0)
diff --git a/setup.c b/setup.c
index 39ff48d9dc5..27535f9f9a2 100644
--- a/setup.c
+++ b/setup.c
@@ -1550,7 +1550,7 @@ static enum discovery_result setup_git_directory_gently_1(struct strbuf *dir,
return GIT_DIR_DISALLOWED_BARE;
if (!ensure_valid_ownership(NULL, NULL, dir->buf, report))
return GIT_DIR_INVALID_OWNERSHIP;
- strbuf_addstr(gitdir, ".");
+ strbuf_addch(gitdir, '.');
return GIT_DIR_BARE;
}
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index baef48aa698..8a05cf2109a 100644
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -226,7 +226,7 @@ static void fn_child_start_fl(const char *file, int line,
if (cmd->dir) {
strbuf_addstr(&buf_payload, " cd ");
sq_quote_buf_pretty(&buf_payload, cmd->dir);
- strbuf_addstr(&buf_payload, ";");
+ strbuf_addch(&buf_payload, ';');
}
/*
base-commit: d882f382b3d939d90cfa58d17b17802338f05d66
--
gitgitgadget
