aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2015-03-12 07:24:15 -0400
committerJohn Szakmeister <john@szakmeister.net>2015-03-12 07:24:15 -0400
commit74531e50dcbaf2b5a49ae72815194066a1f074cd (patch)
tree4c3c46aa234f7538614f6fdd5980cc8b6328f52b /src
parent032c20078a617252ff9fc5ac03b4c390a6868a4d (diff)
parent681125eb94d91d25425f46f72557b8083e94c732 (diff)
downloadrneovim-74531e50dcbaf2b5a49ae72815194066a1f074cd.tar.gz
rneovim-74531e50dcbaf2b5a49ae72815194066a1f074cd.tar.bz2
rneovim-74531e50dcbaf2b5a49ae72815194066a1f074cd.zip
Merge pull request #2114 from oni-link/remove.assert
Fixes for two compiler warnings
Diffstat (limited to 'src')
-rw-r--r--src/nvim/api/vim.c2
-rw-r--r--src/nvim/os/fs.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index f852c8b561..587e19fe35 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -145,7 +145,7 @@ String vim_command_output(String str, Error *err)
Object vim_eval(String str, Error *err)
FUNC_ATTR_DEFERRED
{
- Object rv;
+ Object rv = OBJECT_INIT;
// Evaluate the expression
try_start();
typval_T *expr_result = eval_expr((char_u *) str.data, NULL);
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index 242f8fb461..6200685076 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -42,8 +42,6 @@ int os_chdir(const char *path)
int os_dirname(char_u *buf, size_t len)
FUNC_ATTR_NONNULL_ALL
{
- assert(buf && len);
-
int error_number;
if ((error_number = uv_cwd((char *)buf, &len)) != kLibuvSuccess) {
STRLCPY(buf, uv_strerror(error_number), len);