Merge branch 'rs/mailinfo-lib' into maint

gitster · gitster · commit 71165f027fed · 2016-09-08T21:36:01.000-07:00
Small code clean-up.

* rs/mailinfo-lib:
  mailinfo: recycle strbuf in check_header()
diff --git a/mailinfo.c b/mailinfo.c
@@ -179,12 +179,6 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line)
 	}
 }
 
-static void handle_message_id(struct mailinfo *mi, const struct strbuf *line)
-{
-	if (mi->add_message_id)
-		mi->message_id = strdup(line->buf);
-}
-
 static void handle_content_transfer_encoding(struct mailinfo *mi,
 					     const struct strbuf *line)
 {
@@ -495,7 +489,8 @@ static int check_header(struct mailinfo *mi,
 		len = strlen("Message-Id: ");
 		strbuf_add(&sb, line->buf + len, line->len - len);
 		decode_header(mi, &sb);
-		handle_message_id(mi, &sb);
+		if (mi->add_message_id)
+			mi->message_id = strbuf_detach(&sb, NULL);
 		ret = 1;
 		goto check_header_out;
 	}

Original file line number	Diff line number	Diff line change
`@@ -179,12 +179,6 @@ static void handle_content_type(struct mailinfo mi, struct strbuf line)`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`182`		`-static void handle_message_id(struct mailinfo mi, const struct strbuf line)`
`183`		`-{`
`184`		`- if (mi->add_message_id)`
`185`		`- mi->message_id = strdup(line->buf);`
`186`		`-}`
`187`		`-`
`188`	`182`	`static void handle_content_transfer_encoding(struct mailinfo *mi,`
`189`	`183`	`const struct strbuf *line)`
`190`	`184`	`{`
`@@ -495,7 +489,8 @@ static int check_header(struct mailinfo *mi,`
`495`	`489`	`len = strlen("Message-Id: ");`
`496`	`490`	`strbuf_add(&sb, line->buf + len, line->len - len);`
`497`	`491`	`decode_header(mi, &sb);`
`498`		`- handle_message_id(mi, &sb);`
	`492`	`+ if (mi->add_message_id)`
	`493`	`+ mi->message_id = strbuf_detach(&sb, NULL);`
`499`	`494`	`ret = 1;`
`500`	`495`	`goto check_header_out;`
`501`	`496`	`}`