mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tweaks: meld two calls of free() into a single one, to elide an 'else'

This commit is contained in:
Benno Schulenberg 2019-09-16 16:55:03 +02:00
parent 75a6abe6d2
commit 7b88557ef5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/color.c
View File

@ -197,14 +197,11 @@ void color_update(void)
char *joinednames = charalloc(PATH_MAX + 1); char *joinednames = charalloc(PATH_MAX + 1);
char *fullname = NULL; char *fullname = NULL;
if (currentdir == NULL) if (currentdir != NULL) {
free(reserved);
else {
/* Concatenate the current working directory with the /* Concatenate the current working directory with the
* specified filename, and canonicalize the result. */ * specified filename, and canonicalize the result. */
sprintf(joinednames, "%s/%s", currentdir, openfile->filename); sprintf(joinednames, "%s/%s", currentdir, openfile->filename);
fullname = get_full_path(joinednames); fullname = get_full_path(joinednames);
free(currentdir);
} }
if (fullname == NULL) if (fullname == NULL)
@ -217,6 +214,7 @@ void color_update(void)
free(joinednames); free(joinednames);
free(fullname); free(fullname);
free(reserved);
} }
/* If the filename didn't match anything, try the first line. */ /* If the filename didn't match anything, try the first line. */