зеркало из https://github.com/microsoft/git.git
combine-diff: replace malloc/snprintf with xstrfmt
There's no need to use the magic "100" when a strbuf can do it for us. Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
Родитель
5b1ef2cef4
Коммит
0dc3b035e0
|
@ -292,9 +292,10 @@ static char *grab_blob(const struct object_id *oid, unsigned int mode,
|
||||||
enum object_type type;
|
enum object_type type;
|
||||||
|
|
||||||
if (S_ISGITLINK(mode)) {
|
if (S_ISGITLINK(mode)) {
|
||||||
blob = xmalloc(100);
|
struct strbuf buf = STRBUF_INIT;
|
||||||
*size = snprintf(blob, 100,
|
strbuf_addf(&buf, "Subproject commit %s\n", oid_to_hex(oid));
|
||||||
"Subproject commit %s\n", oid_to_hex(oid));
|
*size = buf.len;
|
||||||
|
blob = strbuf_detach(&buf, NULL);
|
||||||
} else if (is_null_oid(oid)) {
|
} else if (is_null_oid(oid)) {
|
||||||
/* deleted blob */
|
/* deleted blob */
|
||||||
*size = 0;
|
*size = 0;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче