diff --git a/src/Makefile.am b/src/Makefile.am index 0a3764a..bf6a746 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,4 +2,4 @@ bin_PROGRAMS = ncdu ncdu_SOURCES = browser.c calc.c delete.c exclude.c help.c main.c path.c util.c -noinst_HEADERS = browser.h calc.h delete.h exclude.h help.h ncdu.h path.h util.h +noinst_HEADERS = browser.h calc.h delete.h exclude.h global.h help.h path.h util.h diff --git a/src/browser.c b/src/browser.c index abe84f8..3961cfa 100644 --- a/src/browser.c +++ b/src/browser.c @@ -23,12 +23,7 @@ */ -#include "ncdu.h" -#include "browser.h" -#include "util.h" -#include "calc.h" -#include "delete.h" -#include "help.h" +#include "global.h" #include #include @@ -418,14 +413,12 @@ int browse_key(int ch) { nonfo++; break; - /* refresh */ + /* and other stuff */ case 'r': if(browse_dir != NULL) calc_init(getpath(browse_dir->parent), browse_dir->parent); nonfo++; break; - - /* and other stuff */ case 'q': if(flags & BF_INFO) nonfo++; diff --git a/src/browser.h b/src/browser.h index f823947..c7fe1f5 100644 --- a/src/browser.h +++ b/src/browser.h @@ -26,7 +26,7 @@ #ifndef _browser_h #define _browser_h -#include "ncdu.h" +#include "global.h" int browse_key(int); void browse_draw(void); diff --git a/src/calc.c b/src/calc.c index df8a38f..33db219 100644 --- a/src/calc.c +++ b/src/calc.c @@ -23,12 +23,7 @@ */ -#include "ncdu.h" -#include "calc.h" -#include "exclude.h" -#include "util.h" -#include "browser.h" -#include "path.h" +#include "global.h" #include #include diff --git a/src/calc.h b/src/calc.h index da75060..e2f11ad 100644 --- a/src/calc.h +++ b/src/calc.h @@ -26,7 +26,7 @@ #ifndef _calc_h #define _calc_h -#include "ncdu.h" +#include "global.h" extern char calc_smfs; /* stay on the same filesystem */ diff --git a/src/delete.c b/src/delete.c index 5e54d53..ee95e54 100644 --- a/src/delete.c +++ b/src/delete.c @@ -24,10 +24,7 @@ */ -#include "ncdu.h" -#include "util.h" -#include "browser.h" -#include "path.h" +#include "global.h" #include #include diff --git a/src/delete.h b/src/delete.h index 55991b7..afcb733 100644 --- a/src/delete.h +++ b/src/delete.h @@ -26,7 +26,7 @@ #ifndef _delete_h #define _delete_h -#include "ncdu.h" +#include "global.h" void delete_process(void); int delete_key(int); diff --git a/src/ncdu.h b/src/global.h similarity index 91% rename from src/ncdu.h rename to src/global.h index 26a5095..4ccbcdf 100644 --- a/src/ncdu.h +++ b/src/global.h @@ -23,8 +23,8 @@ */ -#ifndef _ncdu_h -#define _ncdu_h +#ifndef _global_h +#define _global_h #include "config.h" #include @@ -84,4 +84,13 @@ extern long update_delay; int input_handle(int); +/* import all other global functions and variables */ +#include "exclude.h" +#include "util.h" +#include "calc.h" +#include "delete.h" +#include "browser.h" +#include "help.h" +#include "path.h" + #endif diff --git a/src/help.c b/src/help.c index 79d5bb7..01e9fa2 100644 --- a/src/help.c +++ b/src/help.c @@ -23,10 +23,7 @@ */ -#include "ncdu.h" -#include "help.h" -#include "browser.h" -#include "util.h" +#include "global.h" #include #include diff --git a/src/help.h b/src/help.h index 96d8c8e..091560d 100644 --- a/src/help.h +++ b/src/help.h @@ -26,7 +26,7 @@ #ifndef _help_h #define _help_h -#include "ncdu.h" +#include "global.h" int help_key(int); void help_draw(void); diff --git a/src/main.c b/src/main.c index b13b55d..a31dfbe 100644 --- a/src/main.c +++ b/src/main.c @@ -23,14 +23,7 @@ */ -#include "ncdu.h" -#include "exclude.h" -#include "util.h" -#include "calc.h" -#include "delete.h" -#include "browser.h" -#include "help.h" -#include "path.h" +#include "global.h" #include #include diff --git a/src/util.h b/src/util.h index 265f6fb..e83c25e 100644 --- a/src/util.h +++ b/src/util.h @@ -26,7 +26,7 @@ #ifndef _util_h #define _util_h -#include "ncdu.h" +#include "global.h" #include /* updated when window is resized */