Find file refactoring:

* (find_cmd): remove.
  * (find_file): rename to find_cmd() and move declaration to cmd.h.
  * find.h: remove.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2020-04-09 08:30:42 +03:00
parent c9e2a4400e
commit d786d88299
5 changed files with 5 additions and 36 deletions

View File

@ -14,7 +14,7 @@ libmcfilemanager_la_SOURCES = \
filegui.c filegui.h \
filenot.c filenot.h \
fileopctx.c fileopctx.h \
find.c find.h \
find.c \
hotlist.c hotlist.h \
info.c info.h \
ioblksize.h \

View File

@ -81,7 +81,6 @@
#include "fileopctx.h"
#include "file.h" /* file operation routines */
#include "find.h" /* find_file() */
#include "filenot.h"
#include "hotlist.h" /* hotlist_show() */
#include "panel.h" /* WPanel */
@ -907,14 +906,6 @@ delete_cmd_local (void)
}
}
/* --------------------------------------------------------------------------------------------- */
void
find_cmd (void)
{
find_file ();
}
/* --------------------------------------------------------------------------------------------- */
/** Invoked from the left/right menus */

View File

@ -64,7 +64,6 @@ void rename_cmd_local (void);
void mkdir_cmd (void);
void delete_cmd (void);
void delete_cmd_local (void);
void find_cmd (void);
void filter_cmd (void);
void reread_cmd (void);
void vfs_list (void);
@ -92,6 +91,8 @@ void quick_view_cmd (void);
#ifdef HAVE_CHARSET
void encoding_cmd (void);
#endif
/* find.c */
void find_cmd (void);
/*** inline functions ****************************************************************************/
#endif /* MC__CMD_H */

View File

@ -54,13 +54,11 @@
#include "src/history.h" /* MC_HISTORY_SHARED_SEARCH */
#include "dir.h"
#include "cmd.h" /* view_file_at_line() */
#include "cmd.h" /* find_cmd(), view_file_at_line() */
#include "midnight.h" /* current_panel */
#include "boxes.h"
#include "panelize.h"
#include "find.h"
/*** global variables ****************************************************************************/
/*** file scope macro definitions ****************************************************************/
@ -1885,7 +1883,7 @@ do_find (const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs,
/* --------------------------------------------------------------------------------------------- */
void
find_file (void)
find_cmd (void)
{
char *start_dir = NULL, *ignore_dirs = NULL;
ssize_t start_dir_len;

View File

@ -1,21 +0,0 @@
/** \file find.h
* \brief Header: Find file command
*/
#ifndef MC__FIND_H
#define MC__FIND_H
/*** typedefs(not structures) and defined constants **********************************************/
/*** enums ***************************************************************************************/
/*** structures declarations (and typedefs of structures)*****************************************/
/*** global variables defined in .c file *********************************************************/
/*** declarations of public functions ************************************************************/
void find_file (void);
/*** inline functions ****************************************************************************/
#endif /* MC__FIND_H */