diff options
| author | Benny Baumann <BenBE@geshi.org> | 2020-09-19 13:55:23 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2020-10-18 20:09:05 +0200 |
| commit | 0f5262917fab34b44b43f63946fdf6bb0621875a (patch) | |
| tree | 07e449767f00310ef038d786688f891600a01b4d | |
| parent | 29346d05616ce69e5988b3f1257c340f91299602 (diff) | |
Make all required includes explicit
Information as seen by IWYU 0.12 + clang 9 on Linux
97 files changed, 642 insertions, 373 deletions
@@ -8,28 +8,32 @@ in the source distribution for its full text. #include "config.h" #include "Action.h" + +#include <pwd.h> +#include <stdbool.h> +#include <stdlib.h> + #include "Affinity.h" #include "AffinityPanel.h" #include "CategoriesPanel.h" +#include "CommandScreen.h" #include "CRT.h" #include "EnvScreen.h" -#include "CommandScreen.h" +#include "FunctionBar.h" +#include "IncSet.h" +#include "InfoScreen.h" +#include "ListItem.h" +#include "Macros.h" #include "MainPanel.h" #include "OpenFilesScreen.h" #include "Process.h" +#include "ProvideCurses.h" #include "ScreenManager.h" #include "SignalsPanel.h" #include "TraceScreen.h" -#include "Platform.h" +#include "Vector.h" #include "XUtils.h" -#include <ctype.h> -#include <math.h> -#include <pwd.h> -#include <stdlib.h> -#include <stdbool.h> -#include <sys/param.h> -#include <sys/time.h> Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess) { Panel* panel = st->panel; @@ -7,8 +7,13 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> +#include <sys/types.h> + #include "Header.h" +#include "Object.h" #include "Panel.h" +#include "Process.h" #include "ProcessList.h" #include "Settings.h" #include "UsersTable.h" @@ -12,8 +12,11 @@ in the source distribution for its full text. #include <stdlib.h> +#include "XUtils.h" + #ifdef HAVE_LIBHWLOC #include <hwloc.h> +#include <hwloc/bitmap.h> #ifdef __linux__ #define HTOP_HWLOC_CPUBIND_FLAG HWLOC_CPUBIND_THREAD #else @@ -8,6 +8,11 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" + +#include <stdbool.h> + +#include "Object.h" #include "Process.h" #include "ProcessList.h" diff --git a/AffinityPanel.c b/AffinityPanel.c index ab17b420..a8cb66ee 100644 --- a/AffinityPanel.c +++ b/AffinityPanel.c @@ -5,21 +5,30 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "config.h" +#include "config.h" // IWYU pragma: keep #include "AffinityPanel.h" #include <assert.h> +#include <stdbool.h> +#include <stdlib.h> #include <string.h> #include "CRT.h" +#include "FunctionBar.h" +#include "Object.h" +#include "ProvideCurses.h" +#include "RichString.h" +#include "Settings.h" #include "Vector.h" #include "XUtils.h" #ifdef HAVE_LIBHWLOC #include <hwloc.h> +#include <hwloc/bitmap.h> #endif + typedef struct MaskItem_ { Object super; char* text; diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c index 32bb470e..feea5786 100644 --- a/AvailableColumnsPanel.c +++ b/AvailableColumnsPanel.c @@ -7,14 +7,17 @@ in the source distribution for its full text. #include "AvailableColumnsPanel.h" -#include <assert.h> #include <ctype.h> +#include <stdbool.h> #include <stdlib.h> -#include <string.h> #include "ColumnsPanel.h" -#include "Header.h" +#include "FunctionBar.h" +#include "ListItem.h" +#include "Object.h" #include "Platform.h" +#include "Process.h" +#include "ProvideCurses.h" #include "XUtils.h" diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c index faa69a8f..33006e94 100644 --- a/AvailableMetersPanel.c +++ b/AvailableMetersPanel.c @@ -6,17 +6,22 @@ in the source distribution for its full text. */ #include "AvailableMetersPanel.h" -#include "MetersPanel.h" + +#include <assert.h> +#include <stdbool.h> +#include <stdlib.h> #include "CPUMeter.h" +#include "FunctionBar.h" #include "Header.h" #include "ListItem.h" +#include "Meter.h" +#include "MetersPanel.h" +#include "Object.h" #include "Platform.h" +#include "ProvideCurses.h" #include "XUtils.h" -#include <assert.h> -#include <stdlib.h> - static void AvailableMetersPanel_delete(Object* object) { Panel* super = (Panel*) object; diff --git a/AvailableMetersPanel.h b/AvailableMetersPanel.h index f168869d..f7359365 100644 --- a/AvailableMetersPanel.h +++ b/AvailableMetersPanel.h @@ -7,6 +7,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "Header.h" #include "Panel.h" #include "ProcessList.h" #include "ScreenManager.h" diff --git a/BatteryMeter.c b/BatteryMeter.c index 22a63c7a..c91ae997 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -9,16 +9,13 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com). #include "BatteryMeter.h" +#include <math.h> + #include "Battery.h" -#include "ProcessList.h" #include "CRT.h" -#include "Platform.h" +#include "Object.h" #include "XUtils.h" -#include <math.h> -#include <string.h> -#include <stdlib.h> - static const int BatteryMeter_attributes[] = { BATTERY @@ -7,15 +7,18 @@ in the source distribution for its full text. #include "CPUMeter.h" +#include <math.h> +#include <stdlib.h> +#include <string.h> + #include "CRT.h" -#include "Settings.h" +#include "Object.h" #include "Platform.h" +#include "ProcessList.h" +#include "RichString.h" +#include "Settings.h" #include "XUtils.h" -#include <assert.h> -#include <stdlib.h> -#include <string.h> -#include <math.h> static const int CPUMeter_attributes[] = { CPU_NICE, @@ -5,28 +5,26 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "config.h" -#include "CRT.h" +#include "config.h" // IWYU pragma: keep -#include "RichString.h" -#include "XUtils.h" +#include "CRT.h" -#include <stdio.h> #include <errno.h> +#include <langinfo.h> +#include <locale.h> #include <signal.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <locale.h> -#include <langinfo.h> #include <unistd.h> +#include "ProvideCurses.h" +#include "XUtils.h" + #ifdef HAVE_EXECINFO_H #include <execinfo.h> #endif -#ifdef HAVE_SETUID_ENABLED -#include <sys/types.h> -#endif #define ColorIndex(i,j) ((7-(i))*8+(j)) @@ -7,10 +7,14 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "Macros.h" +#include "config.h" #include <stdbool.h> +#include "Macros.h" +#include "ProvideCurses.h" + + typedef enum TreeStr_ { TREE_STR_HORZ, TREE_STR_VERT, diff --git a/CategoriesPanel.c b/CategoriesPanel.c index 8adf14f6..d6c25a69 100644 --- a/CategoriesPanel.c +++ b/CategoriesPanel.c @@ -7,15 +7,21 @@ in the source distribution for its full text. #include "CategoriesPanel.h" +#include <ctype.h> +#include <stdbool.h> +#include <stdlib.h> + +#include "AvailableColumnsPanel.h" #include "AvailableMetersPanel.h" -#include "MetersPanel.h" -#include "DisplayOptionsPanel.h" -#include "ColumnsPanel.h" #include "ColorsPanel.h" -#include "AvailableColumnsPanel.h" - -#include <assert.h> -#include <stdlib.h> +#include "ColumnsPanel.h" +#include "DisplayOptionsPanel.h" +#include "FunctionBar.h" +#include "ListItem.h" +#include "MetersPanel.h" +#include "Object.h" +#include "ProvideCurses.h" +#include "Vector.h" static const char* const CategoriesFunctions[] = {" ", " ", " ", " ", " ", " ", " ", " ", " ", "Done ", NULL}; diff --git a/CategoriesPanel.h b/CategoriesPanel.h index 1f17bd2e..0582c642 100644 --- a/CategoriesPanel.h +++ b/CategoriesPanel.h @@ -7,6 +7,7 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "Header.h" #include "Panel.h" #include "ProcessList.h" #include "ScreenManager.h" diff --git a/CheckItem.c b/CheckItem.c index d1f11963..5c79ab13 100644 --- a/CheckItem.c +++ b/CheckItem.c @@ -7,11 +7,12 @@ in the source distribution for its full text. #include "CheckItem.h" -#include "CRT.h" - #include <assert.h> #include <stdlib.h> +#include "CRT.h" +#include "RichString.h" + static void CheckItem_delete(Object* cast) { CheckItem* this = (CheckItem*)cast; diff --git a/CheckItem.h b/CheckItem.h index b4300db4..a357111f 100644 --- a/CheckItem.h +++ b/CheckItem.h @@ -7,6 +7,8 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + #include "Object.h" typedef struct CheckItem_ { diff --git a/ClockMeter.c b/ClockMeter.c index 51fbed63..c6f2ab33 100644 --- a/ClockMeter.c +++ b/ClockMeter.c @@ -5,12 +5,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "ClockMeter.h" +#include "config.h" // IWYU pragma: keep -#include "CRT.h" +#include "ClockMeter.h" #include <time.h> +#include "CRT.h" +#include "Object.h" + static const int ClockMeter_attributes[] = { CLOCK diff --git a/ColorsPanel.c b/ColorsPanel.c index 5b189ea3..24e63b0e 100644 --- a/ColorsPanel.c +++ b/ColorsPanel.c @@ -7,13 +7,19 @@ in the source distribution for its full text. #include "ColorsPanel.h" -#include "CRT.h" +#include <stdbool.h> +#include <stdlib.h> + #include "CheckItem.h" +#include "CRT.h" +#include "FunctionBar.h" +#include "Header.h" +#include "Object.h" +#include "ProvideCurses.h" +#include "RichString.h" +#include "Vector.h" #include "XUtils.h" -#include <assert.h> -#include <stdlib.h> -#include <string.h> // TO ADD A NEW SCHEME: // * Increment the size of bool check in ColorsPanel.h diff --git a/ColumnsPanel.c b/ColumnsPanel.c index a0e9fd31..f8250197 100644 --- a/ColumnsPanel.c +++ b/ColumnsPanel.c @@ -6,15 +6,18 @@ in the source distribution for its full text. */ #include "ColumnsPanel.h" -#include "Platform.h" - -#include "XUtils.h" -#include "ListItem.h" -#include "CRT.h" -#include <assert.h> -#include <stdlib.h> #include <ctype.h> +#include <stdlib.h> + +#include "CRT.h" +#include "FunctionBar.h" +#include "ListItem.h" +#include "Object.h" +#include "Platform.h" +#include "Process.h" +#include "ProvideCurses.h" +#include "XUtils.h" static const char* const ColumnsFunctions[] = {" ", " ", " ", " ", " ", " ", "MoveUp", "MoveDn", "Remove", "Done ", NULL}; diff --git a/ColumnsPanel.h b/ColumnsPanel.h index e8acbb23..68f80450 100644 --- a/ColumnsPanel.h +++ b/ColumnsPanel.h @@ -7,6 +7,8 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + #include "Panel.h" #include "Settings.h" diff --git a/CommandScreen.c b/CommandScreen.c index df039645..7997a64a 100644 --- a/CommandScreen.c +++ b/CommandScreen.c @@ -1,15 +1,14 @@ -#include "CommandScreen.h" +#include "config.h" // IWYU pragma: keep -#include "config.h" -#include "CRT.h" -#include "IncSet.h" -#include "ListItem.h" -#include "Platform.h" -#include "XUtils.h" +#include "CommandScreen.h" #include <stdlib.h> #include <string.h> -#include <unistd.h> + +#include "Macros.h" +#include "Panel.h" +#include "ProvideCurses.h" +#include "XUtils.h" static void CommandScreen_scan(InfoScreen* this) { diff --git a/CommandScreen.h b/CommandScreen.h index 4f3ce947..e56982b2 100644 --- a/CommandScreen.h +++ b/CommandScreen.h @@ -2,6 +2,9 @@ #define HEADER_CommandScreen #include "InfoScreen.h" +#include "Object.h" +#include "Process.h" + typedef struct CommandScreen_ { InfoScreen super; diff --git a/DateMeter.c b/DateMeter.c index 6ea108e1..c1a097f6 100644 --- a/DateMeter.c +++ b/DateMeter.c @@ -5,12 +5,15 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ -#include "DateMeter.h" +#include "config.h" // IWYU pragma: keep -#include "CRT.h" +#include "DateMeter.h" #include <time.h> +#include "CRT.h" +#include "Object.h" + static const int DateMeter_attributes[] = { DATE diff --git a/DateTimeMeter.c b/DateTimeMeter.c index f3c877b3..74582191 100644 --- a/DateTimeMeter.c +++ b/DateTimeMeter.c @@ -5,12 +5,15 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ -#include "DateTimeMeter.h" +#include "config.h" // IWYU pragma: keep -#include "CRT.h" +#include "DateTimeMeter.h" #include <time.h> +#include "CRT.h" +#include "Object.h" + static const int DateTimeMeter_attributes[] = { DATETIME diff --git a/DiskIOMeter.c b/DiskIOMeter.c index d882b433..432ba6f0 100644 --- a/DiskIOMeter.c +++ b/DiskIOMeter.c @@ -7,10 +7,14 @@ in the source distribution for its full text. #include "DiskIOMeter.h" -#include <math.h> +#include <stdio.h> +#include <sys/time.h> #include "CRT.h" +#include "Macros.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" #include "XUtils.h" diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c index d667ab7f..6fa2d39c 100644 --- a/DisplayOptionsPanel.c +++ b/DisplayOptionsPanel.c @@ -5,14 +5,19 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "DisplayOptionsPanel.h" -#include <assert.h> +#include <stdbool.h> #include <stdlib.h> -#include <string.h> #include "CheckItem.h" #include "CRT.h" +#include "FunctionBar.h" +#include "Header.h" +#include "Object.h" +#include "ProvideCurses.h" #include "XUtils.h" diff --git a/EnvScreen.c b/EnvScreen.c index 10060ec7..cd8e0cb3 100644 --- a/EnvScreen.c +++ b/EnvScreen.c @@ -1,16 +1,18 @@ +#include "config.h" // IWYU pragma: keep + #include "EnvScreen.h" -#include "config.h" +#include <stdlib.h> +#include <string.h> + #include "CRT.h" -#include "IncSet.h" -#include "ListItem.h" +#include "Macros.h" +#include "Panel.h" #include "Platform.h" +#include "ProvideCurses.h" +#include "Vector.h" #include "XUtils.h" -#include <stdlib.h> -#include <string.h> -#include <unistd.h> - const InfoScreenClass EnvScreen_class = { .super = { diff --git a/EnvScreen.h b/EnvScreen.h index 428a121f..bf385801 100644 --- a/EnvScreen.h +++ b/EnvScreen.h @@ -2,6 +2,8 @@ #define HEADER_EnvScreen #include "InfoScreen.h" +#include "Object.h" +#include "Process.h" typedef struct EnvScreen_ { InfoScreen super; diff --git a/FunctionBar.c b/FunctionBar.c index 50bae0b1..1c4f395b 100644 --- a/FunctionBar.c +++ b/FunctionBar.c @@ -6,13 +6,14 @@ in the source distribution for its full text. */ #include "FunctionBar.h" -#include "CRT.h" -#include "RichString.h" -#include "XUtils.h" -#include <assert.h> -#include <string.h> #include <stdlib.h> +#include <string.h> + +#include "CRT.h" +#include "Macros.h" +#include "ProvideCurses.h" +#include "XUtils.h" static const char* const FunctionBar_FKeys[] = {"F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", NULL}; diff --git a/Hashtable.h b/Hashtable.h index f4262091..dcdc89fe 100644 --- a/Hashtable.h +++ b/Hashtable.h @@ -9,7 +9,6 @@ in the source distribution for its full text. #include <stdbool.h> -typedef struct Hashtable_ Hashtable; typedef void(*Hashtable_PairFunction)(int, void*, void*); @@ -19,12 +18,12 @@ typedef struct HashtableItem { struct HashtableItem* next; } HashtableItem; -struct Hashtable_ { +typedef struct Hashtable_ { int size; HashtableItem** buckets; int items; bool owner; -}; +} Hashtable; #ifndef NDEBUG @@ -7,14 +7,18 @@ in the source distribution for its full text. #include "Header.h" +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + #include "CRT.h" +#include "Macros.h" +#include "Object.h" #include "Platform.h" +#include "ProvideCurses.h" #include "XUtils.h" -#include <assert.h> -#include <time.h> -#include <string.h> -#include <stdlib.h> Header* Header_new(struct ProcessList_* pl, Settings* settings, int nrColumns) { Header* this = xCalloc(1, sizeof(Header)); @@ -8,6 +8,7 @@ in the source distribution for its full text. */ #include "Meter.h" +#include "ProcessList.h" #include "Settings.h" #include "Vector.h" diff --git a/HostnameMeter.c b/HostnameMeter.c index 24424d01..6cf9e07e 100644 --- a/HostnameMeter.c +++ b/HostnameMeter.c @@ -5,12 +5,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "HostnameMeter.h" +#include "config.h" // IWYU pragma: keep -#include "CRT.h" +#include "HostnameMeter.h" #include <unistd.h> +#include "CRT.h" +#include "Object.h" + static const int HostnameMeter_attributes[] = { HOSTNAME @@ -5,14 +5,20 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "IncSet.h" -#include "ListItem.h" -#include "CRT.h" -#include "XUtils.h" +#include <ctype.h> #include <string.h> #include <stdlib.h> +#include "CRT.h" +#include "ListItem.h" +#include "Object.h" +#include "ProvideCurses.h" +#include "XUtils.h" + static void IncMode_reset(IncMode* mode) { mode->index = 0; @@ -8,9 +8,11 @@ in the source distribution for its full text. */ #include <stdbool.h> +#include <stddef.h> #include "FunctionBar.h" #include "Panel.h" +#include "Vector.h" #define INCMODE_MAX 40 diff --git a/InfoScreen.c b/InfoScreen.c index ed890f7d..0c666234 100644 --- a/InfoScreen.c +++ b/InfoScreen.c @@ -1,18 +1,19 @@ +#include "config.h" // IWYU pragma: keep + #include "InfoScreen.h" -#include "config.h" -#include "Object.h" +#include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + #include "CRT.h" #include "IncSet.h" #include "ListItem.h" -#include "Platform.h" +#include "Object.h" +#include "ProvideCurses.h" #include "XUtils.h" -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <stdarg.h> - static const char* const InfoScreenFunctions[] = {"Search ", "Filter ", "Refresh", "Done ", NULL}; diff --git a/InfoScreen.h b/InfoScreen.h index 79927c47..0d80367d 100644 --- a/InfoScreen.h +++ b/InfoScreen.h @@ -1,12 +1,25 @@ #ifndef HEADER_InfoScreen #define HEADER_InfoScreen +#include <stdbool.h> + #include "FunctionBar.h" #include "IncSet.h" +#include "Macros.h" +#include "Object.h" #include "Panel.h" #include "Process.h" +#include "Vector.h" + -typedef struct InfoScreen_ InfoScreen; +typedef struct InfoScreen_ { + Object super; + const Process* process; + Panel* display; + FunctionBar* bar; + IncSet* inc; + Vector* lines; +} InfoScreen; typedef void(*InfoScreen_Scan)(InfoScreen*); typedef void(*InfoScreen_Draw)(InfoScreen*); @@ -27,15 +40,6 @@ typedef struct InfoScreenClass_ { #define InfoScreen_onErr(this_) As_InfoScreen(this_)->onErr((InfoScreen*)(this_)) #define InfoScreen_onKey(this_, ch_) As_InfoScreen(this_)->onKey((InfoScreen*)(this_), ch_) -struct InfoScreen_ { - Object super; - const Process* process; - Panel* display; - FunctionBar* bar; - IncSet* inc; - Vector* lines; -}; - InfoScreen* InfoScreen_init(InfoScreen* this, const Process* process, FunctionBar* bar, int height, const char* panelHeader); InfoScreen* InfoScreen_done(InfoScreen* this); @@ -5,16 +5,18 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "ListItem.h" +#include <assert.h> +#include <stdlib.h> +#include <string.h> + #include "CRT.h" #include "RichString.h" #include "XUtils.h" -#include <string.h> -#include <assert.h> -#include <stdlib.h> - static void ListItem_delete(Object* cast) { ListItem* this = (ListItem*)cast; @@ -7,6 +7,8 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + #include "Object.h" typedef struct ListItem_ { diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c index c52bffc1..76b89ea1 100644 --- a/LoadAverageMeter.c +++ b/LoadAverageMeter.c @@ -8,7 +8,9 @@ in the source distribution for its full text. #include "LoadAverageMeter.h" #include "CRT.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" #include "XUtils.h" @@ -1,6 +1,8 @@ #ifndef HEADER_Macros #define HEADER_Macros +#include <assert.h> // IWYU pragma: keep + #ifndef MINIMUM #define MINIMUM(a, b) ((a) < (b) ? (a) : (b)) #endif diff --git a/MainPanel.c b/MainPanel.c index 48d869ff..05a55e60 100644 --- a/MainPanel.c +++ b/MainPanel.c @@ -7,12 +7,20 @@ in the source distribution for its full text. */ #include "MainPanel.h" -#include "Process.h" -#include "Platform.h" -#include "CRT.h" +#include <ctype.h> #include <stdlib.h> +#include "CRT.h" +#include "FunctionBar.h" +#include "Platform.h" +#include "Process.h" +#include "ProcessList.h" +#include "ProvideCurses.h" +#include "Settings.h" +#include "XUtils.h" + + static const char* const MainFunctions[] = {"Help ", "Setup ", "Search", "Filter", "Tree ", "SortBy", "Nice -", "Nice +", "Kill ", "Quit ", NULL}; void MainPanel_updateTreeFunctions(MainPanel* this, bool mode) { diff --git a/MainPanel.h b/MainPanel.h index 9e2da305..7f7520d6 100644 --- a/MainPanel.h +++ b/MainPanel.h @@ -8,9 +8,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> +#include <sys/types.h> + #include "Action.h" #include "IncSet.h" +#include "Object.h" #include "Panel.h" +#include "Process.h" + typedef struct MainPanel_ { Panel super; diff --git a/Makefile.am b/Makefile.am index fd02bb3e..d5b05d06 100644 --- a/Makefile.am +++ b/Makefile.am @@ -103,6 +103,7 @@ myhtopheaders = \ Panel.h \ Process.h \ ProcessList.h \ + ProvideCurses.h \ RichString.h \ ScreenManager.h \ Settings.h \ diff --git a/MemoryMeter.c b/MemoryMeter.c index 311f1791..3d29ddf4 100644 --- a/MemoryMeter.c +++ b/MemoryMeter.c @@ -8,13 +8,9 @@ in the source distribution for its full text. #include "MemoryMeter.h" #include "CRT.h" +#include "Object.h" #include "Platform.h" - -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include <sys/param.h> -#include <assert.h> +#include "RichString.h" static const int MemoryMeter_attributes[] = { @@ -5,19 +5,23 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "Meter.h" -#include "RichString.h" -#include "Object.h" +#include <assert.h> +#include <math.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + #include "CRT.h" -#include "Settings.h" +#include "Macros.h" +#include "Object.h" +#include "ProvideCurses.h" +#include "RichString.h" #include "XUtils.h" -#include <math.h> -#include <string.h> -#include <stdlib.h> -#include <stdarg.h> -#include <assert.h> #define GRAPH_HEIGHT 4 /* Unit: rows (lines) */ @@ -7,12 +7,17 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> #include <sys/time.h> #include "ListItem.h" +#include "Object.h" +#include "ProcessList.h" + #define METER_BUFFER_LEN 256 +struct Meter_; typedef struct Meter_ Meter; typedef void(*Meter_Init)(Meter*); @@ -67,7 +72,7 @@ struct Meter_ { int param; GraphData* drawData; int h; - struct ProcessList_* pl; + ProcessList* pl; char curItems; double* values; double total; @@ -91,7 +96,7 @@ typedef enum { extern const MeterClass Meter_class; -Meter* Meter_new(struct ProcessList_* pl, int param, const MeterClass* type); +Meter* Meter_new(ProcessList* pl, int param, const MeterClass* type); int Meter_humanUnit(char* buffer, unsigned long int value, int size); diff --git a/MetersPanel.c b/MetersPanel.c index 89c54e0b..7e47ad8b 100644 --- a/MetersPanel.c +++ b/MetersPanel.c @@ -8,8 +8,14 @@ in the source distribution for its full text. #include "MetersPanel.h" #include <stdlib.h> -#include <assert.h> + #include "CRT.h" +#include "FunctionBar.h" +#include "Header.h" +#include "ListItem.h" +#include "Meter.h" +#include "Object.h" +#include "ProvideCurses.h" // Note: In code the meters are known to have bar/text/graph "Modes", but in UI diff --git a/MetersPanel.h b/MetersPanel.h index 760388d8..cf4de604 100644 --- a/MetersPanel.h +++ b/MetersPanel.h @@ -7,10 +7,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + #include "Panel.h" #include "ScreenManager.h" #include "Settings.h" +#include "Vector.h" + +struct MetersPanel_; typedef struct MetersPanel_ MetersPanel; struct MetersPanel_ { diff --git a/NetworkIOMeter.c b/NetworkIOMeter.c index 07c7dc97..8c0cb45d 100644 --- a/NetworkIOMeter.c +++ b/NetworkIOMeter.c @@ -1,7 +1,14 @@ #include "NetworkIOMeter.h" +#include <stddef.h> +#include <sys/time.h> + #include "CRT.h" +#include "Macros.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" +#include "XUtils.h" static const int NetworkIOMeter_attributes[] = { @@ -8,6 +8,9 @@ in the source distribution for its full text. #include "Object.h" +#include <stddef.h> + + const ObjectClass Object_class = { .extends = NULL }; @@ -9,10 +9,10 @@ in the source distribution for its full text. */ #include "RichString.h" -#include "Macros.h" -#include "XUtils.h" +#include "XUtils.h" // IWYU pragma: keep +struct Object_; typedef struct Object_ Object; typedef void(*Object_Display)(const Object*, RichString*); @@ -29,7 +29,7 @@ typedef void(*Object_Delete)(Object*); #define Class(class_) ((const ObjectClass*)(&(class_ ## _class))) -#define AllocThis(class_) (class_*) xMalloc(sizeof(class_)); Object_setClass(this, Class(class_)); +#define AllocThis(class_) (class_*) xMalloc(sizeof(class_)); Object_setClass(this, Class(class_)); typedef struct ObjectClass_ { const void* const extends; diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c index 8e099bbe..0de9ee03 100644 --- a/OpenFilesScreen.c +++ b/OpenFilesScreen.c @@ -5,24 +5,24 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "OpenFilesScreen.h" +#include "config.h" // IWYU pragma: keep -#include "CRT.h" -#include "ProcessList.h" -#include "IncSet.h" -#include "FunctionBar.h" -#include "XUtils.h" +#include "OpenFilesScreen.h" -#include <string.h> +#include <fcntl.h> #include <stdio.h> -#include <unistd.h> -#include <stdbool.h> -#include <unistd.h> #include <stdlib.h> -#include <fcntl.h> +#include <string.h> +#include <unistd.h> #include <sys/types.h> #include <sys/wait.h> +#include "Macros.h" +#include "Panel.h" +#include "ProvideCurses.h" +#include "Vector.h" +#include "XUtils.h" + typedef struct OpenFiles_Data_ { char* data[7]; diff --git a/OpenFilesScreen.h b/OpenFilesScreen.h index 04a8e395..0fbafe0e 100644 --- a/OpenFilesScreen.h +++ b/OpenFilesScreen.h @@ -7,7 +7,11 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <sys/types.h> + #include "InfoScreen.h" +#include "Object.h" +#include "Process.h" typedef struct OpenFilesScreen_ { InfoScreen super; @@ -7,17 +7,20 @@ in the source distribution for its full text. #include "Panel.h" +#include <assert.h> +#include <ctype.h> +#include <stdbool.h> +#include <stdlib.h> +#include <string.h> +#include <strings.h> + #include "CRT.h" -#include "RichString.h" #include "ListItem.h" +#include "Macros.h" +#include "ProvideCurses.h" +#include "RichString.h" #include "XUtils.h" -#include <math.h> -#include <stdbool.h> -#include <stdlib.h> -#include <ctype.h> -#include <string.h> -#include <assert.h> const PanelClass Panel_class = { .super = { @@ -7,10 +7,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + #include "FunctionBar.h" #include "Object.h" +#include "RichString.h" #include "Vector.h" + +struct Panel_; typedef struct Panel_ Panel; typedef enum HandlerResult_ { @@ -6,36 +6,35 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "Process.h" -#include "Settings.h" -#include "config.h" +#include <assert.h> +#include <limits.h> +#include <math.h> +#include <signal.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> +#include <sys/resource.h> #include "CRT.h" -#include "RichString.h" #include "Platform.h" +#include "RichString.h" +#include "Settings.h" #include "XUtils.h" -#include <stdio.h> -#include <sys/time.h> -#include <sys/resource.h> -#include <sys/param.h> -#include <sys/stat.h> -#include <unistd.h> -#include <stdlib.h> -#include <signal.h> -#include <string.h> -#include <stdbool.h> -#include <pwd.h> -#include <time.h> -#include <assert.h> -#include <math.h> -#ifdef MAJOR_IN_MKDEV +#if defined(MAJOR_IN_MKDEV) #include <sys/mkdev.h> #elif defined(MAJOR_IN_SYSMACROS) #include <sys/sysmacros.h> #endif + static int Process_getuid = -1; char Process_pidFormat[20] = "%7d "; @@ -8,6 +8,14 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> +#include <unistd.h> +#include <sys/types.h> + +#include "Object.h" +#include "RichString.h" + + #ifdef __ANDROID__ #define SYS_ioprio_get __NR_ioprio_get #define SYS_ioprio_set __NR_ioprio_set @@ -20,10 +28,6 @@ in the source distribution for its full text. #endif #define PAGE_SIZE_KB ( PAGE_SIZE / ONE_K ) -#include <sys/types.h> - -#include "Object.h" - #define PROCESS_FLAG_IO 0x0001 typedef enum ProcessFields { diff --git a/ProcessList.c b/ProcessList.c index b7445431..b5a13f0a 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -7,13 +7,12 @@ in the source distribution for its full text. #include "ProcessList.h" +#include <assert.h> +#include <string.h> + #include "CRT.h" -#include "Platform.h" #include "XUtils.h" -#include <stdlib.h> -#include <string.h> - ProcessList* ProcessList_init(ProcessList* this, const ObjectClass* klass, UsersTable* usersTable, Hashtable* pidMatchList, uid_t userId) { this->processes = Vector_new(klass, true, DEFAULT_SIZE); diff --git a/ProcessList.h b/ProcessList.h index 164ff7b0..2dd2c8d2 100644 --- a/ProcessList.h +++ b/ProcessList.h @@ -7,9 +7,16 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + +#include <stdbool.h> +#include <sys/types.h> + #include "Hashtable.h" +#include "Object.h" #include "Panel.h" #include "Process.h" +#include "RichString.h" #include "Settings.h" #include "UsersTable.h" #include "Vector.h" @@ -18,6 +25,7 @@ in the source distribution for its full text. #include <hwloc.h> #endif + #ifndef MAX_NAME #define MAX_NAME 128 #endif diff --git a/ProvideCurses.h b/ProvideCurses.h new file mode 100644 index 00000000..c35d696d --- /dev/null +++ b/ProvideCurses.h @@ -0,0 +1,34 @@ +#ifndef HEADER_ProvideCurses +#define HEADER_ProvideCurses +/* +htop - RichString.h +(C) 2004,2011 Hisham H. Muhammad +Released under the GNU GPL, see the COPYING file +in the source distribution for its full text. +*/ + + +#include "config.h" + +// IWYU pragma: begin_exports + +#ifdef HAVE_NCURSESW_CURSES_H +#include <ncursesw/curses.h> +#elif defined(HAVE_NCURSES_NCURSES_H) +#include <ncurses/ncurses.h> +#elif defined(HAVE_NCURSES_CURSES_H) +#include <ncurses/curses.h> +#elif defined(HAVE_NCURSES_H) +#include <ncurses.h> +#elif defined(HAVE_CURSES_H) +#include <curses.h> +#endif + +#ifdef HAVE_LIBNCURSESW +#include <wchar.h> +#include <wctype.h> +#endif + +// IWYU pragma: end_exports + +#endif // HEADER_ProvideCurses diff --git a/RichString.c b/RichString.c index 3cb19ae4..60fe8d07 100644 --- a/RichString.c +++ b/RichString.c @@ -6,12 +6,14 @@ in the source distribution for its full text. */ #include "RichString.h" -#include "Macros.h" -#include "XUtils.h" +#include <stddef.h> #include <stdlib.h> #include <string.h> +#include "Macros.h" +#include "XUtils.h" + #define charBytes(n) (sizeof(CharType) * (n)) diff --git a/RichString.h b/RichString.h index 8ba0d6ed..2e35b827 100644 --- a/RichString.h +++ b/RichString.h @@ -7,26 +7,10 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ - #include "config.h" -#include <ctype.h> - -#include <assert.h> -#ifdef HAVE_NCURSESW_CURSES_H -#include <ncursesw/curses.h> -#elif defined(HAVE_NCURSES_NCURSES_H) -#include <ncurses/ncurses.h> -#elif defined(HAVE_NCURSES_CURSES_H) -#include <ncurses/curses.h> -#elif defined(HAVE_NCURSES_H) -#include <ncurses.h> -#elif defined(HAVE_CURSES_H) -#include <curses.h> -#endif -#ifdef HAVE_LIBNCURSESW -#include <wctype.h> -#endif +#include "ProvideCurses.h" + #define RichString_size(this) ((this)->chlen) #define RichString_sizeVal(this) ((this).chlen) diff --git a/ScreenManager.c b/ScreenManager.c index 4766e069..2fce07de 100644 --- a/ScreenManager.c +++ b/ScreenManager.c @@ -7,16 +7,17 @@ in the source distribution for its full text. #include "ScreenManager.h" +#include <assert.h> +#include <stdbool.h> +#include <stdlib.h> +#include <sys/time.h> + #include "CRT.h" -#include "MainPanel.h" +#include "FunctionBar.h" #include "Object.h" #include "ProcessList.h" - - -#include <assert.h> -#include <time.h> -#include <stdlib.h> -#include <stdbool.h> +#include "ProvideCurses.h" +#include "XUtils.h" ScreenManager* ScreenManager_new(int x1, int y1, int x2, int y2, Orientation orientation, Header* header, const Settings* settings, const State* state, bool owner) { diff --git a/ScreenManager.h b/ScreenManager.h index ad312930..97e849f3 100644 --- a/ScreenManager.h +++ b/ScreenManager.h @@ -7,12 +7,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + #include "Action.h" #include "Header.h" #include "Panel.h" #include "Settings.h" #include "Vector.h" + typedef enum Orientation_ { VERTICAL, HORIZONTAL @@ -7,15 +7,17 @@ in the source distribution for its full text. #include "Settings.h" +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/stat.h> + #include "CRT.h" +#include "Macros.h" +#include "Meter.h" #include "Platform.h" -#include "Vector.h" #include "XUtils.h" -#include <sys/stat.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> void Settings_delete(Settings* this) { free(this->filename); @@ -7,12 +7,15 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#define DEFAULT_DELAY 15 +#include "config.h" // IWYU pragma: keep #include <stdbool.h> #include "Process.h" + +#define DEFAULT_DELAY 15 + typedef struct { int len; char** names; diff --git a/SignalsPanel.c b/SignalsPanel.c index 0ebe16d3..7937c5dc 100644 --- a/SignalsPanel.c +++ b/SignalsPanel.c @@ -5,17 +5,16 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "Panel.h" #include "SignalsPanel.h" -#include <assert.h> -#include <ctype.h> #include <signal.h> -#include <stdlib.h> +#include <stdbool.h> +#include "FunctionBar.h" #include "ListItem.h" +#include "Object.h" +#include "Panel.h" #include "Platform.h" -#include "RichString.h" #include "XUtils.h" diff --git a/SignalsPanel.h b/SignalsPanel.h index 9ded22f1..0a90b08e 100644 --- a/SignalsPanel.h +++ b/SignalsPanel.h @@ -7,6 +7,8 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "Panel.h" + typedef struct SignalItem_ { const char* name; int number; diff --git a/SwapMeter.c b/SwapMeter.c index fc4e6b28..9de7fa35 100644 --- a/SwapMeter.c +++ b/SwapMeter.c @@ -8,13 +8,9 @@ in the source distribution for its full text. #include "SwapMeter.h" #include "CRT.h" +#include "Object.h" #include "Platform.h" - -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include <sys/param.h> -#include <assert.h> +#include "RichString.h" static const int SwapMeter_attributes[] = { diff --git a/TasksMeter.c b/TasksMeter.c index a13766ed..2116e322 100644 --- a/TasksMeter.c +++ b/TasksMeter.c @@ -8,7 +8,11 @@ in the source distribution for its full text. #include "TasksMeter.h" #include "CRT.h" -#include "Platform.h" +#include "Macros.h" +#include "Object.h" +#include "ProcessList.h" +#include "RichString.h" +#include "Settings.h" #include "XUtils.h" diff --git a/TraceScreen.c b/TraceScreen.c index a3c57870..e83e8a51 100644 --- a/TraceScreen.c +++ b/TraceScreen.c @@ -5,26 +5,28 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "TraceScreen.h" +#include "config.h" // IWYU pragma: keep -#include "CRT.h" -#include "ProcessList.h" -#include "ListItem.h" -#include "IncSet.h" -#include "FunctionBar.h" -#include "XUtils.h" +#include "TraceScreen.h" +#include <assert.h> +#include <fcntl.h> +#include <signal.h> +#include <stdbool.h> #include <stdio.h> -#include <unistd.h> -#include <string.h> #include <stdlib.h> -#include <stdbool.h> +#include <string.h> #include <unistd.h> -#include <fcntl.h> +#include <sys/select.h> #include <sys/time.h> -#include <sys/types.h> #include <sys/wait.h> -#include <signal.h> + +#include "CRT.h" +#include "FunctionBar.h" +#include "IncSet.h" +#include "Panel.h" +#include "ProvideCurses.h" +#include "XUtils.h" static const char* const TraceScreenFunctions[] = {"Search ", "Filter ", "AutoScroll ", "Stop Tracing ", "Done ", NULL}; diff --git a/TraceScreen.h b/TraceScreen.h index 552d14fa..81920479 100644 --- a/TraceScreen.h +++ b/TraceScreen.h @@ -12,6 +12,8 @@ in the source distribution for its full text. #include <sys/types.h> #include "InfoScreen.h" +#include "Object.h" +#include "Process.h" typedef struct TraceScreen_ { diff --git a/UptimeMeter.c b/UptimeMeter.c index 1011aa10..89e34175 100644 --- a/UptimeMeter.c +++ b/UptimeMeter.c @@ -8,6 +8,7 @@ in the source distribution for its full text. #include "UptimeMeter.h" #include "CRT.h" +#include "Object.h" #include "Platform.h" #include "XUtils.h" diff --git a/UsersTable.c b/UsersTable.c index 41e52d3f..89fdfc4d 100644 --- a/UsersTable.c +++ b/UsersTable.c @@ -5,17 +5,12 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "config.h" - #include "UsersTable.h" -#include <stdio.h> -#include <string.h> -#include <strings.h> #include <pwd.h> -#include <sys/types.h> +#include <stdbool.h> +#include <stdio.h> #include <stdlib.h> -#include <assert.h> #include "XUtils.h" @@ -10,7 +10,8 @@ in the source distribution for its full text. #include <assert.h> #include <stdlib.h> #include <string.h> -#include <stdbool.h> + +#include "XUtils.h" Vector* Vector_new(const ObjectClass* type, bool owner, int size) { @@ -9,6 +9,8 @@ in the source distribution for its full text. #include "Object.h" +#include <stdbool.h> + #ifndef DEFAULT_SIZE #define DEFAULT_SIZE (-1) @@ -5,14 +5,13 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "config.h" +#include "config.h" // IWYU pragma: keep #include "XUtils.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> -#include <strings.h> #include <unistd.h> #include "CRT.h" @@ -7,10 +7,11 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include <assert.h> -#include <err.h> +#include "config.h" // IWYU pragma: keep + #include <stdio.h> -#include <stdlib.h> +#include <stdlib.h> // IWYU pragma: keep +#include <string.h> // IWYU pragma: keep #include "Macros.h" diff --git a/freebsd/FreeBSDProcess.h b/freebsd/FreeBSDProcess.h index 25094848..36657060 100644 --- a/freebsd/FreeBSDProcess.h +++ b/freebsd/FreeBSDProcess.h @@ -7,6 +7,14 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> + +#include "Object.h" +#include "Process.h" +#include "RichString.h" +#include "Settings.h" + + typedef enum FreeBSDProcessFields_ { // Add platform-specific fields here, with ids >= 100 JID = 100, diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 92620c9b..62969876 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -5,24 +5,27 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "Macros.h" -#include "ProcessList.h" #include "FreeBSDProcessList.h" -#include "FreeBSDProcess.h" -#include "zfs/ZfsArcStats.h" -#include "zfs/openzfs_sysctl.h" -#include "Macros.h" -#include <unistd.h> -#include <stdlib.h> -#include <sys/types.h> -#include <sys/sysctl.h> -#include <sys/user.h> +#include <assert.h> #include <err.h> #include <fcntl.h> #include <limits.h> +#include <stdlib.h> #include <string.h> #include <time.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/sysctl.h> +#include <sys/user.h> + +#include "FreeBSDProcess.h" +#include "Macros.h" +#include "ProcessList.h" +#include "zfs/ZfsArcStats.h" +#include "zfs/openzfs_sysctl.h" +#include "XUtils.h" + char jail_errmsg[JAIL_ERRMSGLEN]; diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h index 064433b3..75f71c12 100644 --- a/freebsd/FreeBSDProcessList.h +++ b/freebsd/FreeBSDProcessList.h @@ -7,14 +7,20 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "zfs/ZfsArcStats.h" - #include <kvm.h> #include <sys/param.h> #include <sys/jail.h> #include <sys/uio.h> #include <sys/resource.h> +#include "FreeBSDProcess.h" +#include "Hashtable.h" +#include "Process.h" +#include "ProcessList.h" +#include "UsersTable.h" +#include "zfs/ZfsArcStats.h" + + #define JAIL_ERRMSGLEN 1024 extern char jail_errmsg[JAIL_ERRMSGLEN]; @@ -5,28 +5,36 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "config.h" +#include "config.h" // IWYU pragma: keep -#include "FunctionBar.h" -#include "Hashtable.h" +#include <assert.h> +#include <getopt.h> +#include <locale.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + +#include "Action.h" #include "ColumnsPanel.h" #include "CRT.h" +#include "Hashtable.h" +#include "Header.h" +#include "IncSet.h" #include "MainPanel.h" #include "MetersPanel.h" +#include "Panel.h" +#include "Platform.h" +#include "Process.h" #include "ProcessList.h" +#include "ProvideCurses.h" #include "ScreenManager.h" #include "Settings.h" #include "UsersTable.h" -#include "Platform.h" #include "XUtils.h" -#include <getopt.h> -#include <locale.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <unistd.h> //#link m diff --git a/linux/Battery.c b/linux/Battery.c index faf4064c..f3e2ff24 100644 --- a/linux/Battery.c +++ b/linux/Battery.c @@ -13,13 +13,17 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat #include <dirent.h> #include <errno.h> -#include <unistd.h> +#include <fcntl.h> +#include <math.h> +#include <stdbool.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <time.h> -#include <math.h> +#include <unistd.h> +#include "BatteryMeter.h" +#include "Macros.h" #include "XUtils.h" diff --git a/linux/Battery.h b/linux/Battery.h index 496ce1a6..18b0dab6 100644 --- a/linux/Battery.h +++ b/linux/Battery.h @@ -11,6 +11,7 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat #include "BatteryMeter.h" + void Battery_getData(double* level, ACPresence* isOnAC); #endif diff --git a/linux/IOPriorityPanel.c b/linux/IOPriorityPanel.c index cc1b3916..50f57c10 100644 --- a/linux/IOPriorityPanel.c +++ b/linux/IOPriorityPanel.c @@ -7,6 +7,12 @@ in the source distribution for its full text. #include "IOPriorityPanel.h" +#include <stdbool.h> +#include <stddef.h> + +#include "FunctionBar.h" +#include "ListItem.h" +#include "Object.h" #include "XUtils.h" diff --git a/linux/IOPriorityPanel.h b/linux/IOPriorityPanel.h index d7358226..2ac4b316 100644 --- a/linux/IOPriorityPanel.h +++ b/linux/IOPriorityPanel.h @@ -9,7 +9,6 @@ in the source distribution for its full text. #include "Panel.h" #include "IOPriority.h" -#include "ListItem.h" Panel* IOPriorityPanel_new(IOPriority currPrio); diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c index 75900b5a..6d1e3ca6 100644 --- a/linux/LinuxProcess.c +++ b/linux/LinuxProcess.c @@ -6,19 +6,19 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "Process.h" -#include "ProcessList.h" #include "LinuxProcess.h" -#include "CRT.h" -#include "Platform.h" -#include "XUtils.h" +#include <math.h> +#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <string.h> -#include <sys/syscall.h> -#include <time.h> -#include <math.h> +#include <syscall.h> +#include <unistd.h> + +#include "CRT.h" +#include "Process.h" +#include "ProvideCurses.h" +#include "XUtils.h" /* semi-global */ diff --git a/linux/LinuxProcess.h b/linux/LinuxProcess.h index ac80317d..8e7c36dc 100644 --- a/linux/LinuxProcess.h +++ b/linux/LinuxProcess.h @@ -8,6 +8,17 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" + +#include <stdbool.h> +#include <sys/types.h> + +#include "IOPriority.h" +#include "Object.h" +#include "Process.h" +#include "RichString.h" +#include "Settings.h" + #define PROCESS_FLAG_LINUX_IOPRIO 0x0100 #define PROCESS_FLAG_LINUX_OPENVZ 0x0200 #define PROCESS_FLAG_LINUX_VSERVER 0x0400 @@ -87,8 +98,6 @@ typedef enum LinuxProcessFields { LAST_PROCESSFIELD = 124, } LinuxProcessField; -#include "IOPriority.h" - typedef struct LinuxProcess_ { Process super; bool isKernelThread; diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index bbb064d1..1ed13826 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -5,44 +5,52 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" // IWYU pragma: keep + #include "LinuxProcessList.h" -#include "LinuxProcess.h" -#include "CRT.h" -#include "XUtils.h" -#include <errno.h> -#include <sys/time.h> -#include <sys/utsname.h> -#include <sys/stat.h> -#include <unistd.h> +#include <assert.h> #include <dirent.h> -#include <stdlib.h> -#include <stdio.h> -#include <signal.h> -#include <stdbool.h> -#include <stdarg.h> +#include <errno.h> +#include <fcntl.h> #include <math.h> +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <time.h> -#include <assert.h> +#include <strings.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/time.h> #include <sys/types.h> -#include <fcntl.h> -#ifdef MAJOR_IN_MKDEV -#include <sys/mkdev.h> -#elif defined(MAJOR_IN_SYSMACROS) -#include <sys/sysmacros.h> -#endif #ifdef HAVE_DELAYACCT +#include <linux/netlink.h> +#include <linux/taskstats.h> #include <netlink/attr.h> +#include <netlink/handlers.h> +#include <netlink/msg.h> #include <netlink/netlink.h> +#include <netlink/socket.h> #include <netlink/genl/genl.h> #include <netlink/genl/ctrl.h> -#include <netlink/socket.h> -#include <netlink/msg.h> -#include <linux/taskstats.h> #endif +#include "CRT.h" +#include "LinuxProcess.h" +#include "Macros.h" +#include "Object.h" +#include "Process.h" +#include "Settings.h" +#include "XUtils.h" + +#ifdef MAJOR_IN_MKDEV +#include <sys/mkdev.h> +#elif defined(MAJOR_IN_SYSMACROS) +#include <sys/sysmacros.h> +#endif + + static ssize_t xread(int fd, void *buf, size_t count) { // Read some bytes. Retry on EINTR and when we don't get as many bytes as we requested. size_t alreadyRead = 0; diff --git a/linux/LinuxProcessList.h b/linux/LinuxProcessList.h index 913f3cb4..57bc9dc0 100644 --- a/linux/LinuxProcessList.h +++ b/linux/LinuxProcessList.h @@ -7,7 +7,14 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" + +#include <stdbool.h> +#include <sys/types.h> + +#include "Hashtable.h" #include "ProcessList.h" +#include "UsersTable.h" #include "zfs/ZfsArcStats.h" typedef struct CPUData_ { diff --git a/linux/Platform.c b/linux/Platform.c index feb6b6cf..1bb476ab 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -5,39 +5,48 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include "config.h" + #include "Platform.h" + +#include <assert.h> +#include <ctype.h> +#include <math.h> +#include <stdio.h> +#include <string.h> + +#include "BatteryMeter.h" +#include "ClockMeter.h" +#include "CPUMeter.h" +#include "DateMeter.h" +#include "DateTimeMeter.h" +#include "DiskIOMeter.h" +#include "HostnameMeter.h" #include "IOPriority.h" #include "IOPriorityPanel.h" #include "LinuxProcess.h" #include "LinuxProcessList.h" -#include "Battery.h" - +#include "LoadAverageMeter.h" +#include "Macros.h" +#include "MainPanel.h" #include "Meter.h" -#include "CPUMeter.h" -#include "DiskIOMeter.h" #include "MemoryMeter.h" +#include "NetworkIOMeter.h" +#include "Object.h" +#include "Panel.h" +#include "PressureStallMeter.h" +#include "ProcessList.h" +#include "ProvideCurses.h" +#include "SELinuxMeter.h" +#include "Settings.h" #include "SwapMeter.h" #include "TasksMeter.h" -#include "LoadAverageMeter.h" #include "UptimeMeter.h" -#include "PressureStallMeter.h" -#include "ClockMeter.h" -#include "DateMeter.h" -#include "DateTimeMeter.h" -#include "HostnameMeter.h" -#include "NetworkIOMeter.h" -#include "zfs/ZfsArcMeter.h" -#include "zfs/ZfsCompressedArcMeter.h" -#include "LinuxProcess.h" -#include "SELinuxMeter.h" #include "XUtils.h" -#include <math.h> -#include <assert.h> -#include <limits.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include "zfs/ZfsArcMeter.h" +#include "zfs/ZfsArcStats.h" +#include "zfs/ZfsCompressedArcMeter.h" ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, (int)M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; diff --git a/linux/Platform.h b/linux/Platform.h index 007cd32b..3d4cabac 100644 --- a/linux/Platform.h +++ b/linux/Platform.h @@ -7,10 +7,12 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ +#include <stdbool.h> +#include <sys/types.h> + #include "Action.h" -#include "MainPanel.h" -#include "BatteryMeter.h" -#include "LinuxProcess.h" +#include "Meter.h" +#include "Process.h" #include "SignalsPanel.h" extern ProcessField Platform_defaultFields[]; diff --git a/linux/PressureStallMeter.c b/linux/PressureStallMeter.c index 4733415f..9ac0ced2 100644 --- a/linux/PressureStallMeter.c +++ b/linux/PressureStallMeter.c @@ -8,10 +8,14 @@ in the source distribution for its full text. #include "PressureStallMeter.h" +#include <stdbool.h> #include <string.h> #include "CRT.h" +#include "Meter.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" #include "XUtils.h" diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c index 8562215b..275eefef 100644 --- a/linux/SELinuxMeter.c +++ b/linux/SELinuxMeter.c @@ -10,12 +10,16 @@ in the source distribution for its full text. #include "CRT.h" #include <fcntl.h> +#include <stdbool.h> +#include <stdio.h> +#include <unistd.h> #include <linux/magic.h> -#include <sys/stat.h> +#include <sys/statfs.h> #include <sys/statvfs.h> -#include <sys/types.h> -#include <sys/vfs.h> -#include <unistd.h> + +#include "Macros.h" +#include "Object.h" +#include "XUtils.h" static const int SELinuxMeter_attributes[] = { diff --git a/zfs/ZfsArcMeter.c b/zfs/ZfsArcMeter.c index acfe13f2..55ef2c56 100644 --- a/zfs/ZfsArcMeter.c +++ b/zfs/ZfsArcMeter.c @@ -9,19 +9,10 @@ in the source distribution for its full text. #include "ZfsArcStats.h" #include "CRT.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include <sys/param.h> -#include <assert.h> - -/*{ -#include "ZfsArcStats.h" - -#include "Meter.h" -}*/ static const int ZfsArcMeter_attributes[] = { ZFS_MFU, ZFS_MRU, ZFS_ANON, ZFS_HEADER, ZFS_OTHER diff --git a/zfs/ZfsCompressedArcMeter.c b/zfs/ZfsCompressedArcMeter.c index 0153fccb..0a67c7ed 100644 --- a/zfs/ZfsCompressedArcMeter.c +++ b/zfs/ZfsCompressedArcMeter.c @@ -6,23 +6,16 @@ in the source distribution for its full text. */ #include "ZfsCompressedArcMeter.h" -#include "ZfsArcStats.h" #include "CRT.h" +#include "Meter.h" +#include "Object.h" #include "Platform.h" +#include "RichString.h" #include "XUtils.h" -#include <stdlib.h> -#include <string.h> -#include <math.h> -#include <sys/param.h> -#include <assert.h> - -/*{ -#include "ZfsArcStats.h" +#include "zfs/ZfsArcStats.h" -#include "Meter.h" -}*/ static const int ZfsCompressedArcMeter_attributes[] = { ZFS_COMPRESSED |