From: Olga Telezhnaya <olyatelezhnaya@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH RFC 12/20] cat-file: remove batch_write function
Date: Fri, 22 Feb 2019 16:05:45 +0000 [thread overview]
Message-ID: <0102016915f49a63-de2f8b31-3571-4bf8-9663-c8c576c2d5ff-000000@eu-west-1.amazonses.com> (raw)
In-Reply-To: <0102016915f499b8-5813fc52-230b-469e-b939-a1244e83a2b9-000000@eu-west-1.amazonses.com>
Correct me if I am wrong, but it was not really good idea
to implement batch_write in cmd_cat_file. Maybe it's
a good task for newbies to add flag
(whether we accept batch write or not) to write_or_die?
Signed-off-by: Olga Telezhnaia <olyatelezhnaya@gmail.com>
---
builtin/cat-file.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 41f333b73d851..a4e56762f9e56 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -226,15 +226,6 @@ static size_t expand_format(struct strbuf *sb, const char *start, void *data)
return end - start + 1;
}
-static void batch_write(struct batch_options *opt, const void *data, int len)
-{
- if (opt->buffer_output) {
- if (fwrite(data, 1, len, stdout) != len)
- die_errno("unable to write to stdout");
- } else
- write_or_die(1, data, len);
-}
-
static void print_object_or_die(struct batch_options *opt, struct expand_data *data)
{
const struct object_id *oid = &data->oid;
@@ -269,7 +260,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
oid_to_hex(oid), rest);
} else
BUG("invalid cmdmode: %c", opt->cmdmode);
- batch_write(opt, contents, size);
+ write_or_die(1, contents, size);
free(contents);
} else if (stream_blob_to_fd(1, oid, NULL, 0))
die("unable to stream %s to stdout", oid_to_hex(oid));
@@ -287,7 +278,7 @@ static void print_object_or_die(struct batch_options *opt, struct expand_data *d
if (data->info.sizep && size != data->size)
die("object %s changed size!?", oid_to_hex(oid));
- batch_write(opt, contents, size);
+ write_or_die(1, contents, size);
free(contents);
}
}
@@ -309,11 +300,11 @@ static void batch_object_write(const char *obj_name,
strbuf_reset(scratch);
strbuf_expand(scratch, opt->format.format, expand_format, data);
strbuf_addch(scratch, '\n');
- batch_write(opt, scratch->buf, scratch->len);
+ write_or_die(1, scratch->buf, scratch->len);
if (opt->print_contents) {
print_object_or_die(opt, data);
- batch_write(opt, "\n", 1);
+ write_or_die(1, "\n", 1);
}
}
--
https://github.com/git/git/pull/568
next prev parent reply other threads:[~2019-02-22 16:06 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 15:50 [PATCH RFC 0/20] cat-file: start using formatting logic from ref-filter Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 01/20] cat-file: reuse struct ref_format Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 04/20] for-each-ref: tests for new atom %(rest) added Olga Telezhnaya
2019-02-28 21:11 ` Jeff King
2019-03-01 6:10 ` Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 19/20] cat-file: tests for new atoms added Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 11/20] cat-file: move filter_object to diff.c Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 15/20] ref-filter: add raw formatting option Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 03/20] ref-filter: add rest " Olga Telezhnaya
2019-02-28 21:07 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 17/20] cat-file: reuse ref-filter formatting logic Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 02/20] ref-filter: rename field in ref_array_item stuct Olga Telezhnaya
2019-02-28 21:06 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 16/20] for-each-ref: tests for new atom %(raw) added Olga Telezhnaya
2019-02-22 16:05 ` Olga Telezhnaya [this message]
2019-02-22 16:05 ` [PATCH RFC 07/20] cat-file: remove skip_object_info Olga Telezhnaya
2019-02-28 21:26 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 09/20] ref-filter: make expand_data global Olga Telezhnaya
2019-02-28 21:30 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 06/20] cat-file: remove mark_query from expand_data Olga Telezhnaya
2019-02-28 21:25 ` Jeff King
2019-03-03 9:41 ` Christian Couder
2019-02-22 16:05 ` [PATCH RFC 10/20] cat-file: inline stream_blob Olga Telezhnaya
2019-02-28 21:33 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 05/20] cat-file: remove split_on_whitespace Olga Telezhnaya
2019-02-28 21:22 ` Jeff King
2019-02-22 16:05 ` [PATCH RFC 14/20] cat-file: move print_object_or_die to ref-filter Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 20/20] cat-file: update docs Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 13/20] cat-file: rewrite print_object_or_die Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 18/20] cat-file: get rid of expand_data Olga Telezhnaya
2019-02-22 16:05 ` [PATCH RFC 08/20] cat-file: remove rest from expand_data Olga Telezhnaya
2019-02-28 21:27 ` Jeff King
2019-02-28 21:04 ` [PATCH RFC 01/20] cat-file: reuse struct ref_format Jeff King
2019-02-22 16:09 ` [PATCH RFC 0/20] cat-file: start using formatting logic from ref-filter Eric Sunshine
2019-02-22 16:19 ` Olga Telezhnaya
2019-02-28 21:41 ` Jeff King
2019-03-01 6:16 ` Olga Telezhnaya
2019-02-28 21:43 ` Jeff King
2019-03-01 6:17 ` Olga Telezhnaya
2019-03-03 1:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0102016915f49a63-de2f8b31-3571-4bf8-9663-c8c576c2d5ff-000000@eu-west-1.amazonses.com \
--to=olyatelezhnaya@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).