imap-send.c: use less verbose strbuf_fread() idiom
When looking for things that hardcoded a non-zero "hint" parameter to strbuf_fread() I discovered that since f2561fda364 (Add git-imap-send, derived from isync 1.0.1., 2006-03-10) we've been passing a hardcoded 4096 in imap-send.c to read stdin. Since we're not doing anything unusual here let's use a less verbose pattern used in a lot of other places (the hint of "0" will default to 8192). We don't need to take a FILE * here either, so we can use "0" instead of "stdin". While we're at it improve the error message if we can't read the input to use error_errno(). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jul 7, 2021 at 11:05 UTC
351bca2d1f814e69740ac0b023bdfb7978b5c215
1 file changed
+2
-14
imap-send.c
+2
-14
@@ -1266,18 +1266,6 @@ static void wrap_in_html(struct strbuf *msg)
1266
*msg = buf;
1267
}
1268
1269
-#define CHUNKSIZE 0x1000
1270
-
1271
-static int read_message(FILE *f, struct strbuf *all_msgs)
1272
-{
1273
- do {
1274
- if (strbuf_fread(all_msgs, CHUNKSIZE, f) <= 0)
1275
- break;
1276
- } while (!feof(f));
1277
-
1278
- return ferror(f) ? -1 : 0;
1279
-}
1280
-
1269
static int count_messages(struct strbuf *all_msgs)
1270
{
1271
int count = 0;
@@ -1582,8 +1570,8 @@ int cmd_main(int argc, const char **argv)
1570
}
1571
1572
/* read the messages */
1585
- if (read_message(stdin, &all_msgs)) {
1586
- fprintf(stderr, "error reading input\n");
1573
+ if (strbuf_read(&all_msgs, 0, 0) < 0) {
1574
+ error_errno(_("could not read from stdin"));
1575
return 1;
1576
}
1577