aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2016-06-23 21:17:24 +0300
committerZyX <kp-pav@yandex.ru>2016-06-24 00:07:55 +0300
commit2dd154457ceb4bbc122b9e1ad34bf693ee3dd510 (patch)
treee54434bfa74a18b1c3b66453066bf7f27541ce18
parentfec7983ecd7ac58f4f8ad9f8b4dc8f6937b87099 (diff)
downloadrneovim-2dd154457ceb4bbc122b9e1ad34bf693ee3dd510.tar.gz
rneovim-2dd154457ceb4bbc122b9e1ad34bf693ee3dd510.tar.bz2
rneovim-2dd154457ceb4bbc122b9e1ad34bf693ee3dd510.zip
file: Move src/nvim/file.* to src/nvim/os/fileio.*
-rw-r--r--src/nvim/os/fileio.c (renamed from src/nvim/file.c)6
-rw-r--r--src/nvim/os/fileio.h (renamed from src/nvim/file.h)8
-rw-r--r--src/nvim/shada.c2
-rw-r--r--test/unit/os/fileio_spec.lua (renamed from test/unit/file_spec.lua)2
4 files changed, 9 insertions, 9 deletions
diff --git a/src/nvim/file.c b/src/nvim/os/fileio.c
index 2730e5b5f9..6abcceb485 100644
--- a/src/nvim/file.c
+++ b/src/nvim/os/fileio.c
@@ -1,4 +1,4 @@
-/// @file file.c
+/// @file fileio.c
///
/// Buffered reading/writing to a file. Unlike fileio.c this is not dealing with
/// Neovim stuctures for buffer, with autocommands, etc: just fopen/fread/fwrite
@@ -18,7 +18,7 @@
#include <uv.h>
-#include "nvim/file.h"
+#include "nvim/os/fileio.h"
#include "nvim/memory.h"
#include "nvim/os/os.h"
#include "nvim/globals.h"
@@ -26,7 +26,7 @@
#include "nvim/macros.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "file.c.generated.h"
+# include "os/fileio.c.generated.h"
#endif
/// Open file
diff --git a/src/nvim/file.h b/src/nvim/os/fileio.h
index 2ba415d2b9..2cffd5c851 100644
--- a/src/nvim/file.h
+++ b/src/nvim/os/fileio.h
@@ -1,5 +1,5 @@
-#ifndef NVIM_FILE_H
-#define NVIM_FILE_H
+#ifndef NVIM_OS_FILEIO_H
+#define NVIM_OS_FILEIO_H
#include <stdbool.h>
#include <stddef.h>
@@ -67,6 +67,6 @@ enum {
};
#ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "file.h.generated.h"
+# include "os/fileio.h.generated.h"
#endif
-#endif // NVIM_FILE_H
+#endif // NVIM_OS_FILEIO_H
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index a833b958b9..5047ef9647 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -35,7 +35,7 @@
#include "nvim/version.h"
#include "nvim/path.h"
#include "nvim/fileio.h"
-#include "nvim/file.h"
+#include "nvim/os/fileio.h"
#include "nvim/strings.h"
#include "nvim/quickfix.h"
#include "nvim/eval/encode.h"
diff --git a/test/unit/file_spec.lua b/test/unit/os/fileio_spec.lua
index ac78dffe6e..22b61786c0 100644
--- a/test/unit/file_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -7,7 +7,7 @@ local ok = helpers.ok
local ffi = helpers.ffi
local cimport = helpers.cimport
-local m = cimport('./src/nvim/file.h')
+local m = cimport('./src/nvim/os/fileio.h')
local s = ''
for i = 0, 255 do