mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 19:36:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove nonnullret deadcode: Mark new nonnullret functions.

Browse Source
This commit is contained in:
Eliseo Martínez
2015-01-23 14:13:16 +01:00
parent 6425627c3f
commit 2ad0ca9c76
3 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/nvim/charset.c
View File

@@ -390,19 +390,13 @@ char_u *transstr(char_u *s) FUNC_ATTR_NONNULL_RET
return res; return res;
} }
/// Convert the string "str[orglen]" to do ignore-case comparing. Uses the /// Convert the string "str[orglen]" to do ignore-case comparing.
/// current locale. /// Use the current locale.
/// ///
/// When "buf" is NULL returns an allocated string (NULL for out-of-memory). /// When "buf" is NULL, return an allocated string.
/// Otherwise puts the result in "buf[buflen]". /// Otherwise, put the result in buf, limited by buflen, and return buf.
///
/// @param str
/// @param orglen
/// @param buf
/// @param buflen
///
/// @return converted string.
char_u* str_foldcase(char_u *str, int orglen, char_u *buf, int buflen) char_u* str_foldcase(char_u *str, int orglen, char_u *buf, int buflen)
FUNC_ATTR_NONNULL_RET
{ {
garray_T ga; garray_T ga;
int i; int i;

51
src/nvim/ex_getln.c
View File

@@ -3265,6 +3265,7 @@ addstar (
int len, int len,
int context /* EXPAND_FILES etc. */ int context /* EXPAND_FILES etc. */
) )
FUNC_ATTR_NONNULL_RET
{ {
char_u *retval; char_u *retval;
int i, j; int i, j;
@@ -3343,35 +3344,33 @@ addstar (
} }
} else { } else {
retval = xmalloc(len + 4); retval = xmalloc(len + 4);
if (retval != NULL) { STRLCPY(retval, fname, len + 1);
STRLCPY(retval, fname, len + 1);
/* /*
* Don't add a star to *, ~, ~user, $var or `cmd`. * Don't add a star to *, ~, ~user, $var or `cmd`.
* * would become **, which walks the whole tree. * * would become **, which walks the whole tree.
* ~ would be at the start of the file name, but not the tail. * ~ would be at the start of the file name, but not the tail.
* $ could be anywhere in the tail. * $ could be anywhere in the tail.
* ` could be anywhere in the file name. * ` could be anywhere in the file name.
* When the name ends in '$' don't add a star, remove the '$'. * When the name ends in '$' don't add a star, remove the '$'.
*/ */
tail = path_tail(retval); tail = path_tail(retval);
ends_in_star = (len > 0 && retval[len - 1] == '*'); ends_in_star = (len > 0 && retval[len - 1] == '*');
#ifndef BACKSLASH_IN_FILENAME #ifndef BACKSLASH_IN_FILENAME
for (i = len - 2; i >= 0; --i) { for (i = len - 2; i >= 0; --i) {
if (retval[i] != '\\') if (retval[i] != '\\')
break; break;
ends_in_star = !ends_in_star; ends_in_star = !ends_in_star;
}
#endif
if ((*retval != '~' || tail != retval)
&& !ends_in_star
&& vim_strchr(tail, '$') == NULL
&& vim_strchr(retval, '`') == NULL)
retval[len++] = '*';
else if (len > 0 && retval[len - 1] == '$')
--len;
retval[len] = NUL;
} }
#endif
if ((*retval != '~' || tail != retval)
&& !ends_in_star
&& vim_strchr(tail, '$') == NULL
&& vim_strchr(retval, '`') == NULL)
retval[len++] = '*';
else if (len > 0 && retval[len - 1] == '$')
--len;
retval[len] = NUL;
} }
return retval; return retval;
} }

2
src/nvim/fileio.c
View File

@@ -28,6 +28,7 @@
#include "nvim/ex_docmd.h" #include "nvim/ex_docmd.h"
#include "nvim/ex_eval.h" #include "nvim/ex_eval.h"
#include "nvim/fold.h" #include "nvim/fold.h"
#include "nvim/func_attr.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/hashtab.h" #include "nvim/hashtab.h"
#include "nvim/iconv.h" #include "nvim/iconv.h"
@@ -2106,6 +2107,7 @@ void set_forced_fenc(exarg_T *eap)
* When *pp is not set to NULL, the result is in allocated memory. * When *pp is not set to NULL, the result is in allocated memory.
*/ */
static char_u *next_fenc(char_u **pp) static char_u *next_fenc(char_u **pp)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
{ {
char_u *p; char_u *p;
char_u *r; char_u *r;