Merge branch 'jc/maint-strbuf-add-fix-doubling'

gitster · gitster · commit 886932e2816b · 2010-01-20T14:43:09.000-08:00
* jc/maint-strbuf-add-fix-doubling:
  strbuf_addbuf(): allow passing the same buf to dst and src
diff --git a/strbuf.h b/strbuf.h
@@ -104,6 +104,7 @@ static inline void strbuf_addstr(struct strbuf *sb, const char *s) {
 	strbuf_add(sb, s, strlen(s));
 }
 static inline void strbuf_addbuf(struct strbuf *sb, const struct strbuf *sb2) {
+	strbuf_grow(sb, sb2->len);
 	strbuf_add(sb, sb2->buf, sb2->len);
 }
 extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len);

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ static inline void strbuf_addstr(struct strbuf sb, const char s) {`
`104`	`104`	`strbuf_add(sb, s, strlen(s));`
`105`	`105`	`}`
`106`	`106`	`static inline void strbuf_addbuf(struct strbuf sb, const struct strbuf sb2) {`
	`107`	`+ strbuf_grow(sb, sb2->len);`
`107`	`108`	`strbuf_add(sb, sb2->buf, sb2->len);`
`108`	`109`	`}`
`109`	`110`	`extern void strbuf_adddup(struct strbuf *sb, size_t pos, size_t len);`