aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.1.0615: Unnecessary STRLEN() in make_percent_swname()

Browse Source 
Problem:  Unnecessary STRLEN() in make_percent_swname()
Solution: Pass the end of "dir" to make_percent_swname()
          (zeertzjq)

closes: #15340

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq 2024-07-25 20:58:42 +02:00 committed by Christian Brabandt
parent 4d68054c1e
commit 242667ae14
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bufwrite.c
View File

@ -1350,7 +1350,7 @@ buf_write(
p = copybuf + STRLEN(copybuf); p = copybuf + STRLEN(copybuf);
if (after_pathsep(copybuf, p) && p[-1] == p[-2]) if (after_pathsep(copybuf, p) && p[-1] == p[-2])
// Ends with '//', use full path // Ends with '//', use full path
if ((p = make_percent_swname(copybuf, fname)) != NULL) if ((p = make_percent_swname(copybuf, p, fname)) != NULL)
{ {
backup = modname(p, backup_ext, FALSE); backup = modname(p, backup_ext, FALSE);
vim_free(p); vim_free(p);
@ -1564,7 +1564,7 @@ buf_write(
p = IObuff + STRLEN(IObuff); p = IObuff + STRLEN(IObuff);
if (after_pathsep(IObuff, p) && p[-1] == p[-2]) if (after_pathsep(IObuff, p) && p[-1] == p[-2])
// path ends with '//', use full path // path ends with '//', use full path
if ((p = make_percent_swname(IObuff, fname)) != NULL) if ((p = make_percent_swname(IObuff, p, fname)) != NULL)
{ {
backup = modname(p, backup_ext, FALSE); backup = modname(p, backup_ext, FALSE);
vim_free(p); vim_free(p);

8
src/memline.c
View File

@ -1975,7 +1975,7 @@ recover_names(
if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2]) if (after_pathsep(dir_name, p) && len > 1 && p[-1] == p[-2])
{ {
// Ends with '//', Use Full path for swap name // Ends with '//', Use Full path for swap name
tail = make_percent_swname(dir_name, fname_res); tail = make_percent_swname(dir_name, p, fname_res);
} }
else else
#endif #endif
@ -2143,7 +2143,7 @@ recover_names(
* removed. * removed.
*/ */
char_u * char_u *
make_percent_swname(char_u *dir, char_u *name) make_percent_swname(char_u *dir, char_u *dir_end, char_u *name)
{ {
char_u *d = NULL, *s, *f; char_u *d = NULL, *s, *f;
@ -2159,7 +2159,7 @@ make_percent_swname(char_u *dir, char_u *name)
if (vim_ispathsep(*d)) if (vim_ispathsep(*d))
*d = '%'; *d = '%';
dir[STRLEN(dir) - 1] = NUL; // remove one trailing slash dir_end[-1] = NUL; // remove one trailing slash
d = concat_fnames(dir, s, TRUE); d = concat_fnames(dir, s, TRUE);
vim_free(s); vim_free(s);
} }
@ -4676,7 +4676,7 @@ makeswapname(
if (after_pathsep(dir_name, s) && len > 1 && s[-1] == s[-2]) if (after_pathsep(dir_name, s) && len > 1 && s[-1] == s[-2])
{ // Ends with '//', Use Full path { // Ends with '//', Use Full path
r = NULL; r = NULL;
if ((s = make_percent_swname(dir_name, fname_res)) != NULL) if ((s = make_percent_swname(dir_name, s, fname_res)) != NULL)
{ {
r = modname(s, (char_u *)".swp", FALSE); r = modname(s, (char_u *)".swp", FALSE);
vim_free(s); vim_free(s);

2
src/proto/memline.pro
View File

@ -11,7 +11,7 @@ void ml_close_notmod(void);
void ml_timestamp(buf_T *buf); void ml_timestamp(buf_T *buf);
void ml_recover(int checkext); void ml_recover(int checkext);
int recover_names(char_u *fname, int do_list, list_T *ret_list, int nr, char_u **fname_out); int recover_names(char_u *fname, int do_list, list_T *ret_list, int nr, char_u **fname_out);
char_u *make_percent_swname(char_u *dir, char_u *name); char_u *make_percent_swname(char_u *dir, char_u *dir_end, char_u *name);
void get_b0_dict(char_u *fname, dict_T *d); void get_b0_dict(char_u *fname, dict_T *d);
void ml_sync_all(int check_file, int check_char); void ml_sync_all(int check_file, int check_char);
void ml_preserve(buf_T *buf, int message); void ml_preserve(buf_T *buf, int message);

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
615,
/**/ /**/
614, 614,
/**/ /**/