diff options
| -rw-r--r-- | src/ex_cmds.c | 2 | ||||
| -rw-r--r-- | src/fileio.c | 16 | ||||
| -rw-r--r-- | src/fileio.h | 1 | ||||
| -rw-r--r-- | src/memline.c | 8 |
4 files changed, 7 insertions, 20 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 57584fb37d..7723dda267 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -1569,7 +1569,7 @@ void write_viminfo(char_u *file, int forceit) #endif // Make tempname - tempname = buf_modname(fname, (char_u *)".tmp", FALSE); + tempname = modname(fname, (char_u *)".tmp", FALSE); if (tempname != NULL) { /* * Check if tempfile already exists. Never overwrite an diff --git a/src/fileio.c b/src/fileio.c index 0296f65608..d4448c2f16 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -3039,7 +3039,7 @@ buf_write ( /* * Make backup file name. */ - backup = buf_modname(rootname, backup_ext, FALSE); + backup = modname(rootname, backup_ext, FALSE); if (backup == NULL) { vim_free(rootname); some_error = TRUE; /* out of memory */ @@ -3215,7 +3215,7 @@ nobackup: if (rootname == NULL) backup = NULL; else { - backup = buf_modname(rootname, backup_ext, FALSE); + backup = modname(rootname, backup_ext, FALSE); vim_free(rootname); } @@ -3852,7 +3852,7 @@ restore_backup: * the backup file our 'original' file. */ if (*p_pm && dobackup) { - char *org = (char *)buf_modname(fname, p_pm, FALSE); + char *org = (char *)modname(fname, p_pm, FALSE); if (backup != NULL) { struct stat st; @@ -4644,16 +4644,6 @@ modname ( int prepend_dot /* may prepend a '.' to file name */ ) { - return buf_modname(fname, ext, prepend_dot); -} - -char_u * -buf_modname ( - char_u *fname, - char_u *ext, - int prepend_dot /* may prepend a '.' to file name */ -) -{ char_u *retval; char_u *s; char_u *e; diff --git a/src/fileio.h b/src/fileio.h index ce6e649b10..061e6bcf96 100644 --- a/src/fileio.h +++ b/src/fileio.h @@ -35,7 +35,6 @@ void msg_add_fname(buf_T *buf, char_u *fname); void msg_add_lines(int insert_space, long lnum, off_t nchars); void shorten_fnames(int force); char_u *modname(char_u *fname, char_u *ext, int prepend_dot); -char_u *buf_modname(char_u *fname, char_u *ext, int prepend_dot); int vim_fgets(char_u *buf, int size, FILE *fp); int tag_fgets(char_u *buf, int size, FILE *fp); int vim_rename(char_u *from, char_u *to); diff --git a/src/memline.c b/src/memline.c index 38b68344b9..31f1b525ca 100644 --- a/src/memline.c +++ b/src/memline.c @@ -1610,9 +1610,7 @@ recover_names ( struct stat st; char_u *swapname; - swapname = modname(fname_res, - (char_u *)".swp", TRUE - ); + swapname = modname(fname_res, (char_u *)".swp", TRUE); if (swapname != NULL) { if (mch_stat((char *)swapname, &st) != -1) { /* It exists! */ files = (char_u **)alloc((unsigned)sizeof(char_u *)); @@ -3372,8 +3370,8 @@ char_u *makeswapname(char_u *fname, char_u *ffname, buf_T *buf, char_u *dir_name #endif // Prepend a '.' to the swap file name for the current directory. - r = buf_modname(fname_res, (char_u *)".swp", - dir_name[0] == '.' && dir_name[1] == NUL); + r = modname(fname_res, (char_u *)".swp", + dir_name[0] == '.' && dir_name[1] == NUL); if (r == NULL) /* out of memory */ return NULL; |