Merge branch 'rs/strbuf-remove-fix'

gitster · gitster · commit 3ba0bbb901c6 · 2016-09-21T15:15:25.000-07:00
Code cleanup.

* rs/strbuf-remove-fix:
  strbuf: use valid pointer in strbuf_remove()
diff --git a/strbuf.c b/strbuf.c
@@ -187,7 +187,7 @@ void strbuf_insert(struct strbuf *sb, size_t pos, const void *data, size_t len)
 
 void strbuf_remove(struct strbuf *sb, size_t pos, size_t len)
 {
-	strbuf_splice(sb, pos, len, NULL, 0);
+	strbuf_splice(sb, pos, len, "", 0);
 }
 
 void strbuf_add(struct strbuf *sb, const void *data, size_t len)

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ void strbuf_insert(struct strbuf sb, size_t pos, const void data, size_t len)`
`187`	`187`
`188`	`188`	`void strbuf_remove(struct strbuf *sb, size_t pos, size_t len)`
`189`	`189`	`{`
`190`		`- strbuf_splice(sb, pos, len, NULL, 0);`
	`190`	`+ strbuf_splice(sb, pos, len, "", 0);`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`void strbuf_add(struct strbuf sb, const void data, size_t len)`