mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-07 13:56:20 +02:00
Code

Merge branch 'ab/imap-send-read-everything-simplify' 

Code simplification.

* ab/imap-send-read-everything-simplify:
  imap-send.c: use less verbose strbuf_fread() idiom
This commit is contained in:
Junio C Hamano 2021-07-22 13:05:56 -07:00
parent bb3a55f6d3 351bca2d1f
commit 33309e428b
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
imap-send.c
View File

@ -1266,18 +1266,6 @@ static void wrap_in_html(struct strbuf *msg)
*msg = buf;
}
#define CHUNKSIZE 0x1000
static int read_message(FILE *f, struct strbuf *all_msgs)
{
do {
if (strbuf_fread(all_msgs, CHUNKSIZE, f) <= 0)
break;
} while (!feof(f));
return ferror(f) ? -1 : 0;
}
static int count_messages(struct strbuf *all_msgs)
{
int count = 0;
@ -1582,8 +1570,8 @@ int cmd_main(int argc, const char **argv)
}
/* read the messages */
if (read_message(stdin, &all_msgs)) {
fprintf(stderr, "error reading input\n");
if (strbuf_read(&all_msgs, 0, 0) < 0) {
error_errno(_("could not read from stdin"));
return 1;
}