diff options
| author | Felipe Oliveira Carvalho <felipekde@gmail.com> | 2014-04-19 02:12:47 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-04-24 10:31:31 -0300 |
| commit | 42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876 (patch) | |
| tree | 8c056bd42ec55f2103d65af680a54bd55dc71d7f /src/misc1.c | |
| parent | 4b6b9117b3e8b9b624c354a703f01f0980c60946 (diff) | |
| download | rneovim-42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876.tar.gz rneovim-42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876.tar.bz2 rneovim-42f1bd9b2228aaca4fb8a5597a3b5774f7ef6876.zip | |
No OOM error condition in ga_concat_strings(), concat_fnames(), concat_str()
- xmallocz() is not static anymore. There are many use cases for this function
in the codebase and we should start using it.
- Simpler types in ga_concat_strings()
Diffstat (limited to 'src/misc1.c')
| -rw-r--r-- | src/misc1.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/misc1.c b/src/misc1.c index 671ab93327..45e09c7bf0 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -3125,11 +3125,11 @@ static char_u *vim_version_dir(char_u *vimdir) if (vimdir == NULL || *vimdir == NUL) return NULL; p = concat_fnames(vimdir, (char_u *)VIM_VERSION_NODOT, TRUE); - if (p != NULL && os_isdir(p)) + if (os_isdir(p)) return p; vim_free(p); p = concat_fnames(vimdir, (char_u *)RUNTIME_DIRNAME, TRUE); - if (p != NULL && os_isdir(p)) + if (os_isdir(p)) return p; vim_free(p); return NULL; @@ -3163,11 +3163,8 @@ void vim_setenv(char_u *name, char_u *val) */ if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0) { char_u *buf = concat_str(val, (char_u *)"/lang"); - - if (buf != NULL) { - bindtextdomain(VIMPACKAGE, (char *)buf); - vim_free(buf); - } + bindtextdomain(VIMPACKAGE, (char *)buf); + vim_free(buf); } } |