From 85100bb01dfebabf4b2557fd6d8a6041f83b0a76 Mon Sep 17 00:00:00 2001 From: Felipe Oliveira Carvalho Date: Sat, 31 May 2014 00:40:07 -0300 Subject: No OOM in concat_str() (few remaining cases) Also fixed the duplicated declaration (path.c and strings.c) --- src/nvim/strings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/strings.c') diff --git a/src/nvim/strings.c b/src/nvim/strings.c index ac0e5e1aef..45aec5841b 100644 --- a/src/nvim/strings.c +++ b/src/nvim/strings.c @@ -15,6 +15,7 @@ #include "nvim/fileio.h" #include "nvim/func_attr.h" #include "nvim/fold.h" +#include "nvim/func_attr.h" #include "nvim/getchar.h" #include "nvim/mark.h" #include "nvim/mbyte.h" @@ -514,7 +515,6 @@ int has_non_ascii(char_u *s) /* * Concatenate two strings and return the result in allocated memory. - * Returns NULL when out of memory. */ char_u *concat_str(char_u *str1, char_u *str2) FUNC_ATTR_NONNULL_RET { -- cgit