development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 12:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'rs/strbuf-read-file-or-whine'

Browse source 
Code clean-up.

* rs/strbuf-read-file-or-whine:
  sequencer: factor out strbuf_read_file_or_whine()
This commit is contained in:
Junio C Hamano 2018-03-06 14:54:07 -08:00
parent 327e524d66 878056005e
commit c14d5f99cd
1 changed files with 28 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
sequencer.c
View file

@ -1869,22 +1869,31 @@ static int count_commands(struct todo_list *todo_list)
return count; return count;
} }
static ssize_t strbuf_read_file_or_whine(struct strbuf *sb, const char *path)
{
int fd;
ssize_t len;
fd = open(path, O_RDONLY);
if (fd < 0)
return error_errno(_("could not open '%s'"), path);
len = strbuf_read(sb, fd, 0);
close(fd);
if (len < 0)
return error(_("could not read '%s'."), path);
return len;
}
static int read_populate_todo(struct todo_list *todo_list, static int read_populate_todo(struct todo_list *todo_list,
struct replay_opts *opts) struct replay_opts *opts)
{ {
struct stat st; struct stat st;
const char *todo_file = get_todo_path(opts); const char *todo_file = get_todo_path(opts);
int fd, res; int res;
strbuf_reset(&todo_list->buf); strbuf_reset(&todo_list->buf);
fd = open(todo_file, O_RDONLY); if (strbuf_read_file_or_whine(&todo_list->buf, todo_file) < 0)
if (fd < 0) return -1;
return error_errno(_("could not open '%s'"), todo_file);
if (strbuf_read(&todo_list->buf, fd, 0) < 0) {
close(fd);
return error(_("could not read '%s'."), todo_file);
}
close(fd);
res = stat(todo_file, &st); res = stat(todo_file, &st);
if (res) if (res)
@ -3155,20 +3164,13 @@ int check_todo_list(void)
struct strbuf todo_file = STRBUF_INIT; struct strbuf todo_file = STRBUF_INIT;
struct todo_list todo_list = TODO_LIST_INIT; struct todo_list todo_list = TODO_LIST_INIT;
struct strbuf missing = STRBUF_INIT; struct strbuf missing = STRBUF_INIT;
int advise_to_edit_todo = 0, res = 0, fd, i; int advise_to_edit_todo = 0, res = 0, i;
strbuf_addstr(&todo_file, rebase_path_todo()); strbuf_addstr(&todo_file, rebase_path_todo());
fd = open(todo_file.buf, O_RDONLY); if (strbuf_read_file_or_whine(&todo_list.buf, todo_file.buf) < 0) {
if (fd < 0) { res = -1;
res = error_errno(_("could not open '%s'"), todo_file.buf);
goto leave_check; goto leave_check;
} }
if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
close(fd);
res = error(_("could not read '%s'."), todo_file.buf);
goto leave_check;
}
close(fd);
advise_to_edit_todo = res = advise_to_edit_todo = res =
parse_insn_buffer(todo_list.buf.buf, &todo_list); parse_insn_buffer(todo_list.buf.buf, &todo_list);
@ -3184,17 +3186,10 @@ int check_todo_list(void)
todo_list_release(&todo_list); todo_list_release(&todo_list);
strbuf_addstr(&todo_file, ".backup"); strbuf_addstr(&todo_file, ".backup");
fd = open(todo_file.buf, O_RDONLY); if (strbuf_read_file_or_whine(&todo_list.buf, todo_file.buf) < 0) {
if (fd < 0) { res = -1;
res = error_errno(_("could not open '%s'"), todo_file.buf);
goto leave_check; goto leave_check;
} }
if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
close(fd);
res = error(_("could not read '%s'."), todo_file.buf);
goto leave_check;
}
close(fd);
strbuf_release(&todo_file); strbuf_release(&todo_file);
res = !!parse_insn_buffer(todo_list.buf.buf, &todo_list); res = !!parse_insn_buffer(todo_list.buf.buf, &todo_list);
@ -3275,15 +3270,8 @@ int skip_unnecessary_picks(void)
} }
strbuf_release(&buf); strbuf_release(&buf);
fd = open(todo_file, O_RDONLY); if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
if (fd < 0) { return -1;
return error_errno(_("could not open '%s'"), todo_file);
}
if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
close(fd);
return error(_("could not read '%s'."), todo_file);
}
close(fd);
if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) { if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
todo_list_release(&todo_list); todo_list_release(&todo_list);
return -1; return -1;
@ -3374,17 +3362,11 @@ int rearrange_squash(void)
const char *todo_file = rebase_path_todo(); const char *todo_file = rebase_path_todo();
struct todo_list todo_list = TODO_LIST_INIT; struct todo_list todo_list = TODO_LIST_INIT;
struct hashmap subject2item; struct hashmap subject2item;
int res = 0, rearranged = 0, *next, *tail, fd, i; int res = 0, rearranged = 0, *next, *tail, i;
char **subjects; char **subjects;
fd = open(todo_file, O_RDONLY); if (strbuf_read_file_or_whine(&todo_list.buf, todo_file) < 0)
if (fd < 0) return -1;
return error_errno(_("could not open '%s'"), todo_file);
if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
close(fd);
return error(_("could not read '%s'."), todo_file);
}
close(fd);
if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) { if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
todo_list_release(&todo_list); todo_list_release(&todo_list);
return -1; return -1;