mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 11:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: Satisfy linter (newest type casts rule)

Browse Source
This commit is contained in:
ZyX
2016-06-23 23:49:23 +03:00
parent a3b05a03b6
commit 75bd39d49c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/nvim/os/fs.c
View File

@@ -392,7 +392,7 @@ ptrdiff_t os_read(const int fd, bool *ret_eof, char *const ret_buf,
const ptrdiff_t cur_read_bytes = read(fd, ret_buf + read_bytes, const ptrdiff_t cur_read_bytes = read(fd, ret_buf + read_bytes,
size - read_bytes); size - read_bytes);
if (cur_read_bytes > 0) { if (cur_read_bytes > 0) {
read_bytes += (size_t) cur_read_bytes; read_bytes += (size_t)cur_read_bytes;
assert(read_bytes <= size); assert(read_bytes <= size);
} }
if (cur_read_bytes < 0) { if (cur_read_bytes < 0) {
@@ -412,7 +412,7 @@ ptrdiff_t os_read(const int fd, bool *ret_eof, char *const ret_buf,
did_try_to_free = true; did_try_to_free = true;
continue; continue;
} else { } else {
return (ptrdiff_t) error; return (ptrdiff_t)error;
} }
} }
if (cur_read_bytes == 0) { if (cur_read_bytes == 0) {
@@ -420,11 +420,11 @@ ptrdiff_t os_read(const int fd, bool *ret_eof, char *const ret_buf,
break; break;
} }
} }
return (ptrdiff_t) read_bytes; return (ptrdiff_t)read_bytes;
} }
#ifdef HAVE_READV #ifdef HAVE_READV
/// Read from a file to a multiple buffers at once /// Read from a file to multiple buffers at once
/// ///
/// Wrapper for readv(). /// Wrapper for readv().
/// ///
@@ -455,7 +455,7 @@ ptrdiff_t os_readv(int fd, bool *ret_eof, struct iovec *iov, size_t iov_size)
if (cur_read_bytes > 0) { if (cur_read_bytes > 0) {
read_bytes += (size_t)cur_read_bytes; read_bytes += (size_t)cur_read_bytes;
while (iov_size && cur_read_bytes) { while (iov_size && cur_read_bytes) {
if (cur_read_bytes < (ptrdiff_t) iov->iov_len) { if (cur_read_bytes < (ptrdiff_t)iov->iov_len) {
iov->iov_len -= (size_t)cur_read_bytes; iov->iov_len -= (size_t)cur_read_bytes;
iov->iov_base = (char *)iov->iov_base + cur_read_bytes; iov->iov_base = (char *)iov->iov_base + cur_read_bytes;
cur_read_bytes = 0; cur_read_bytes = 0;
@@ -509,7 +509,7 @@ ptrdiff_t os_write(const int fd, const char *const buf, const size_t size)
const ptrdiff_t cur_written_bytes = write(fd, buf + written_bytes, const ptrdiff_t cur_written_bytes = write(fd, buf + written_bytes,
size - written_bytes); size - written_bytes);
if (cur_written_bytes > 0) { if (cur_written_bytes > 0) {
written_bytes += (size_t) cur_written_bytes; written_bytes += (size_t)cur_written_bytes;
} }
if (cur_written_bytes < 0) { if (cur_written_bytes < 0) {
#ifdef HAVE_UV_TRANSLATE_SYS_ERROR #ifdef HAVE_UV_TRANSLATE_SYS_ERROR
@@ -532,7 +532,7 @@ ptrdiff_t os_write(const int fd, const char *const buf, const size_t size)
return UV_UNKNOWN; return UV_UNKNOWN;
} }
} }
return (ptrdiff_t) written_bytes; return (ptrdiff_t)written_bytes;
} }
/// Flushes file modifications to disk. /// Flushes file modifications to disk.

6
src/nvim/shada.c
View File

@@ -3007,8 +3007,8 @@ shada_write_file_nomerge: {}
if (getuid() == ROOT_UID) { if (getuid() == ROOT_UID) {
if (old_info.stat.st_uid != ROOT_UID if (old_info.stat.st_uid != ROOT_UID
|| old_info.stat.st_gid != getgid()) { || old_info.stat.st_gid != getgid()) {
const uv_uid_t old_uid = (uv_uid_t) old_info.stat.st_uid; const uv_uid_t old_uid = (uv_uid_t)old_info.stat.st_uid;
const uv_gid_t old_gid = (uv_gid_t) old_info.stat.st_gid; const uv_gid_t old_gid = (uv_gid_t)old_info.stat.st_gid;
const int fchown_ret = os_fchown(file_fd(sd_writer.cookie), const int fchown_ret = os_fchown(file_fd(sd_writer.cookie),
old_uid, old_gid); old_uid, old_gid);
if (fchown_ret != 0) { if (fchown_ret != 0) {
@@ -3192,7 +3192,7 @@ static ShaDaReadResult fread_len(ShaDaReadDef *const sd_reader,
emsgf(_(RCERR "Error while reading ShaDa file: " emsgf(_(RCERR "Error while reading ShaDa file: "
"last entry specified that it occupies %" PRIu64 " bytes, " "last entry specified that it occupies %" PRIu64 " bytes, "
"but file ended earlier"), "but file ended earlier"),
(uint64_t) length); (uint64_t)length);
return kSDReadStatusNotShaDa; return kSDReadStatusNotShaDa;
} }
} }