IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove char_u: make_percent_swname()

Browse Source
This commit is contained in:
Mark Bainter 2015-04-20 13:17:00 +00:00
parent 7774b97d57
commit 477b6a2c44
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/macros.h
View File

@ -128,7 +128,7 @@
/* Get the length of the character p points to */
# define MB_PTR2LEN(p) (has_mbyte ? (*mb_ptr2len)(p) : 1)
/* Advance multi-byte pointer, skip over composing chars. */
# define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1
# define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len)((char_u *)p) : 1
/* Advance multi-byte pointer, do not skip over composing chars. */
# define mb_cptr_adv(p) p += \
enc_utf8 ? utf_ptr2len(p) : has_mbyte ? (*mb_ptr2len)(p) : 1

23
src/nvim/memline.c
View File

@ -1342,7 +1342,7 @@ recover_names (
p = dir_name + STRLEN(dir_name);
if (after_pathsep((char *)dir_name, (char *)p) && p[-1] == p[-2]) {
/* Ends with '//', Use Full path for swap name */
tail = make_percent_swname(dir_name, fname_res);
tail = (char_u *)make_percent_swname((char *)dir_name, (char *)fname_res);
} else {
tail = path_tail(fname_res);
tail = concat_fnames(dir_name, tail, TRUE);
@ -1441,18 +1441,19 @@ recover_names (
* Append the full path to name with path separators made into percent
* signs, to dir. An unnamed buffer is handled as "" (<currentdir>/"")
*/
static char_u *make_percent_swname(char_u *dir, char_u *name)
static char *make_percent_swname(const char *dir, char *name)
FUNC_ATTR_NONNULL_ARG(1)
{
char_u *d, *s, *f;
f = (char_u *)fix_fname(name != NULL ? (char *)name : "");
d = NULL;
char *d = NULL;
char *f = fix_fname(name != NULL ? name : "");
if (f != NULL) {
s = (char_u *)xstrdup((char *)f);
for (d = s; *d != NUL; mb_ptr_adv(d))
if (vim_ispathsep(*d))
char *s = xstrdup(f);
for (d = s; *d != NUL; mb_ptr_adv(d)) {
if (vim_ispathsep(*d)) {
*d = '%';
d = concat_fnames(dir, s, TRUE);
}
}
d = (char *)concat_fnames((char_u *)dir, (char_u *)s, TRUE);
xfree(s);
xfree(f);
}
@ -3068,7 +3069,7 @@ char_u *makeswapname(char_u *fname, char_u *ffname, buf_T *buf, char_u *dir_name
s = dir_name + STRLEN(dir_name);
if (after_pathsep((char *)dir_name, (char *)s) && s[-1] == s[-2]) { /* Ends with '//', Use Full path */
r = NULL;
if ((s = make_percent_swname(dir_name, fname)) != NULL) {
if ((s = (char_u *)make_percent_swname((char *)dir_name, (char *)fname)) != NULL) {
r = (char_u *)modname((char *)s, ".swp", FALSE);
xfree(s);
}