LineageOS/android_external_nano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #ifdefs so that nano compiles with NANO_SMALL defined and

Browse Source 
DISABLE_TABCOMP undefined


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2670 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey
2005-06-15 06:30:05 +00:00
parent 2515ccc0a0
commit ab41ab9246
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/files.c
View File

@@ -2010,6 +2010,15 @@ int diralphasort(const void *va, const void *vb)
return strcasecmp(a, b);
}
/* Free the memory allocated for array, which should contain len
* elements. */
void free_chararray(char **array, size_t len)
{
for (; len > 0; len--)
free(array[len - 1]);
free(array);
}
#endif
#ifndef DISABLE_TABCOMP
@@ -2337,7 +2346,7 @@ char *input_tab(char *buf, size_t *place, bool *lastwastab, bool *list)
free(mzero);
}
free_charptrarray(matches, num_matches);
free_chararray(matches, num_matches);
/* Only refresh the edit window if we don't have a list of filename
* matches on it. */
@@ -2366,15 +2375,6 @@ const char *tail(const char *foo)
}
#ifndef DISABLE_BROWSER
/* Free our malloc()ed memory. */
void free_charptrarray(char **array, size_t len)
{
for (; len > 0; len--)
free(array[len - 1]);
free(array);
}
/* Strip one directory from the end of path. */
void striponedir(char *path)
{
@@ -2651,7 +2651,7 @@ char *do_browser(char *path, DIR *dir)
path = mallocstrcpy(path, filelist[selected]);
/* Start over again with the new path value. */
free_charptrarray(filelist, numents);
free_chararray(filelist, numents);
goto change_browser_directory;
/* Refresh the screen. */
@@ -2711,7 +2711,7 @@ char *do_browser(char *path, DIR *dir)
/* Start over again with the new path value. */
free(path);
path = new_path;
free_charptrarray(filelist, numents);
free_chararray(filelist, numents);
goto change_browser_directory;
/* Abort the browser. */
@@ -2821,7 +2821,7 @@ char *do_browser(char *path, DIR *dir)
SET(CONSTUPDATE);
/* Clean up. */
free_charptrarray(filelist, numents);
free_chararray(filelist, numents);
free(path);
return retval;