diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-07-26 11:18:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-26 11:18:19 +0200 |
| commit | b42bfa599b3fc15d0b613cfcff8c742e57854cf3 (patch) | |
| tree | 14de0a1eb8da856c567256a9b8acf6e5d0005c4f /src/nvim/diff.c | |
| parent | 8a9c9a996322a1d111c55efb156710add68da358 (diff) | |
| parent | 2731080212fad1430becae0cb56fe33238e7e24a (diff) | |
| download | rneovim-b42bfa599b3fc15d0b613cfcff8c742e57854cf3.tar.gz rneovim-b42bfa599b3fc15d0b613cfcff8c742e57854cf3.tar.bz2 rneovim-b42bfa599b3fc15d0b613cfcff8c742e57854cf3.zip | |
Merge #10589 'os/fs: introduce os_fopen()'
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index f720e702a4..f2b3abb526 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -951,7 +951,7 @@ static int check_external_diff(diffio_T *diffio) TriState ok = kFalse; for (;;) { ok = kFalse; - FILE *fd = mch_fopen((char *)diffio->dio_orig.din_fname, "w"); + FILE *fd = os_fopen((char *)diffio->dio_orig.din_fname, "w"); if (fd == NULL) { io_error = true; @@ -960,7 +960,7 @@ static int check_external_diff(diffio_T *diffio) io_error = true; } fclose(fd); - fd = mch_fopen((char *)diffio->dio_new.din_fname, "w"); + fd = os_fopen((char *)diffio->dio_new.din_fname, "w"); if (fd == NULL) { io_error = true; @@ -971,7 +971,7 @@ static int check_external_diff(diffio_T *diffio) fclose(fd); fd = NULL; if (diff_file(diffio) == OK) { - fd = mch_fopen((char *)diffio->dio_diff.dout_fname, "r"); + fd = os_fopen((char *)diffio->dio_diff.dout_fname, "r"); } if (fd == NULL) { @@ -1505,7 +1505,7 @@ static void diff_read(int idx_orig, int idx_new, diffout_T *dout) if (dout->dout_fname == NULL) { diffstyle = DIFF_UNIFIED; } else { - fd = mch_fopen((char *)dout->dout_fname, "r"); + fd = os_fopen((char *)dout->dout_fname, "r"); if (fd == NULL) { EMSG(_("E98: Cannot read diff output")); return; |