diff options
author | Stefan Hoffmann <stefan991@gmail.com> | 2014-08-27 22:36:38 +0200 |
---|---|---|
committer | Stefan Hoffmann <stefan991@gmail.com> | 2014-08-31 15:47:44 +0200 |
commit | 7ac191ab1085875319e139b044ec1f98498b87ce (patch) | |
tree | 85e4651f4d56f6dc5b61df65eff9da9dd83ecce2 | |
parent | 10813ce38c6588664e1decc8ba35424923cfb2e4 (diff) | |
download | rneovim-7ac191ab1085875319e139b044ec1f98498b87ce.tar.gz rneovim-7ac191ab1085875319e139b044ec1f98498b87ce.tar.bz2 rneovim-7ac191ab1085875319e139b044ec1f98498b87ce.zip |
fileinfo: change returntype of os_fileinfo_size
off_t -> uint64_t
-rw-r--r-- | src/nvim/buffer_defs.h | 2 | ||||
-rw-r--r-- | src/nvim/diff.c | 2 | ||||
-rw-r--r-- | src/nvim/eval.c | 4 | ||||
-rw-r--r-- | src/nvim/fileio.c | 2 | ||||
-rw-r--r-- | src/nvim/os/fs.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index 4162df63ab..3b12925119 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -512,7 +512,7 @@ struct file_buffer { long b_mtime; /* last change time of original file */ long b_mtime_read; /* last change time when reading */ - off_t b_orig_size; /* size of original file in bytes */ + uint64_t b_orig_size; /* size of original file in bytes */ int b_orig_mode; /* mode of original file */ pos_T b_namedm[NMARKS]; /* current named marks (mark.c) */ diff --git a/src/nvim/diff.c b/src/nvim/diff.c index 8b0bf4e997..73b5731ad0 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -949,7 +949,7 @@ void ex_diffpatch(exarg_T *eap) // Only continue if the output file was created. FileInfo file_info; bool info_ok = os_fileinfo((char *)tmp_new, &file_info); - off_t filesize = os_fileinfo_size(&file_info); + uint64_t filesize = os_fileinfo_size(&file_info); if (!info_ok || filesize == 0) { EMSG(_("E816: Cannot read patch output")); } else { diff --git a/src/nvim/eval.c b/src/nvim/eval.c index b1943bae86..a9570ecc84 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -9167,14 +9167,14 @@ static void f_getfsize(typval_T *argvars, typval_T *rettv) FileInfo file_info; if (os_fileinfo(fname, &file_info)) { - off_t filesize = os_fileinfo_size(&file_info); + uint64_t filesize = os_fileinfo_size(&file_info); if (os_isdir((char_u *)fname)) rettv->vval.v_number = 0; else { rettv->vval.v_number = (varnumber_T)filesize; /* non-perfect check for overflow */ - if ((off_t)rettv->vval.v_number != filesize) { + if ((uint64_t)rettv->vval.v_number != filesize) { rettv->vval.v_number = -2; } } diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 264032758f..0a05b2a4db 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -4790,7 +4790,7 @@ buf_check_timestamp ( int helpmesg = FALSE; int reload = FALSE; int can_reload = FALSE; - off_t orig_size = buf->b_orig_size; + uint64_t orig_size = buf->b_orig_size; int orig_mode = buf->b_orig_mode; static int busy = FALSE; int n; diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c index df6491d57d..bb4e897887 100644 --- a/src/nvim/os/fs.c +++ b/src/nvim/os/fs.c @@ -397,7 +397,7 @@ uint64_t os_fileinfo_inode(const FileInfo *file_info) /// Get the size of a file from a `FileInfo`. /// /// @return filesize in bytes. -off_t os_fileinfo_size(const FileInfo *file_info) +uint64_t os_fileinfo_size(const FileInfo *file_info) FUNC_ATTR_NONNULL_ALL { return file_info->stat.st_size; |