Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-18 00:22:17 +0300
committerJunio C Hamano <gitster@pobox.com>2020-02-18 00:22:17 +0300
commit9f3f38769d49255d3fbf97f35a0dec591de17db3 (patch)
treed0b4e0ef5aab675c75932a5cf888c4f32397497f /mailinfo.c
parentcbecc168d4264d93295cd1e0a48dc19f0ed1880c (diff)
parent517b60564e2c69cbb79895e04b24a6393273398f (diff)
Merge branch 'rs/strbuf-insertstr'
Code clean-up. * rs/strbuf-insertstr: mailinfo: don't insert header prefix for handle_content_type() strbuf: add and use strbuf_insertstr()
Diffstat (limited to 'mailinfo.c')
-rw-r--r--mailinfo.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mailinfo.c b/mailinfo.c
index b395adbdf2..402ef04dd1 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -254,7 +254,7 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line)
mi->delsp = has_attr_value(line->buf, "delsp=", "yes");
if (slurp_attr(line->buf, "boundary=", boundary)) {
- strbuf_insert(boundary, 0, "--", 2);
+ strbuf_insertstr(boundary, 0, "--");
if (++mi->content_top >= &mi->content[MAX_BOUNDARIES]) {
error("Too many boundaries to handle");
mi->input_error = -1;
@@ -570,7 +570,6 @@ static int check_header(struct mailinfo *mi,
len = strlen("Content-Type: ");
strbuf_add(&sb, line->buf + len, line->len - len);
decode_header(mi, &sb);
- strbuf_insert(&sb, 0, "Content-Type: ", len);
handle_content_type(mi, &sb);
ret = 1;
goto check_header_out;