htop-dev · fasterit · Oct 18, 2020 · Sep 19, 2020 · Oct 14, 2020 · Oct 14, 2020
diff --git a/Action.c b/Action.c
@@ -19,9 +19,9 @@ in the source distribution for its full text.
 #include "Process.h"
 #include "ScreenManager.h"
 #include "SignalsPanel.h"
-#include "StringUtils.h"
 #include "TraceScreen.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <ctype.h>
 #include <math.h>

diff --git a/AffinityPanel.c b/AffinityPanel.c
@@ -5,14 +5,17 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "AffinityPanel.h"
-#include "CRT.h"
+#include "config.h"
 
-#include "Vector.h"
+#include "AffinityPanel.h"
 
 #include <assert.h>
 #include <string.h>
 
+#include "CRT.h"
+#include "Vector.h"
+#include "XUtils.h"
+
 #ifdef HAVE_LIBHWLOC
 #include <hwloc.h>
 #endif

diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c
@@ -6,16 +6,17 @@ in the source distribution for its full text.
 */
 
 #include "AvailableColumnsPanel.h"
-#include "Platform.h"
-
-#include "Header.h"
-#include "ColumnsPanel.h"
 
 #include <assert.h>
-#include <stdlib.h>
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include "ColumnsPanel.h"
+#include "Header.h"
+#include "Platform.h"
+#include "XUtils.h"
+
 
 static const char* const AvailableColumnsFunctions[] = {"      ", "      ", "      ", "      ", "Add   ", "      ", "      ", "      ", "      ", "Done  ", NULL};
 

diff --git a/AvailableMetersPanel.c b/AvailableMetersPanel.c
@@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "Header.h"
 #include "ListItem.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/BatteryMeter.c b/BatteryMeter.c
@@ -12,8 +12,8 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
 #include "Battery.h"
 #include "ProcessList.h"
 #include "CRT.h"
-#include "StringUtils.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <math.h>
 #include <string.h>

diff --git a/CPUMeter.c b/CPUMeter.c
@@ -10,6 +10,7 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Settings.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/CRT.c b/CRT.c
@@ -8,8 +8,8 @@ in the source distribution for its full text.
 #include "config.h"
 #include "CRT.h"
 
-#include "StringUtils.h"
 #include "RichString.h"
+#include "XUtils.h"
 
 #include <stdio.h>
 #include <errno.h>

diff --git a/ColorsPanel.c b/ColorsPanel.c
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "CheckItem.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <stdlib.h>

diff --git a/ColumnsPanel.c b/ColumnsPanel.c
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 #include "ColumnsPanel.h"
 #include "Platform.h"
 
-#include "StringUtils.h"
+#include "XUtils.h"
 #include "ListItem.h"
 #include "CRT.h"
 

diff --git a/CommandScreen.c b/CommandScreen.c
@@ -5,7 +5,7 @@
 #include "IncSet.h"
 #include "ListItem.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/DiskIOMeter.c b/DiskIOMeter.c
@@ -11,6 +11,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 
 static const int DiskIOMeter_attributes[] = {

diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c
@@ -7,13 +7,14 @@ in the source distribution for its full text.
 
 #include "DisplayOptionsPanel.h"
 
-#include "CheckItem.h"
-#include "CRT.h"
-
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "CheckItem.h"
+#include "CRT.h"
+#include "XUtils.h"
+
 
 static const char* const DisplayOptionsFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};
 

diff --git a/EnvScreen.c b/EnvScreen.c
@@ -5,7 +5,7 @@
 #include "IncSet.h"
 #include "ListItem.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/FunctionBar.c b/FunctionBar.c
@@ -8,7 +8,7 @@ in the source distribution for its full text.
 #include "FunctionBar.h"
 #include "CRT.h"
 #include "RichString.h"
-#include "XAlloc.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <string.h>

diff --git a/Hashtable.c b/Hashtable.c
@@ -6,7 +6,7 @@ in the source distribution for its full text.
 */
 
 #include "Hashtable.h"
-#include "XAlloc.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <assert.h>

diff --git a/Header.c b/Header.c
@@ -8,8 +8,8 @@ in the source distribution for its full text.
 #include "Header.h"
 
 #include "CRT.h"
-#include "StringUtils.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <time.h>

diff --git a/IncSet.c b/IncSet.c
@@ -6,9 +6,10 @@ in the source distribution for its full text.
 */
 
 #include "IncSet.h"
-#include "StringUtils.h"
 #include "ListItem.h"
 #include "CRT.h"
+#include "XUtils.h"
+
 #include <string.h>
 #include <stdlib.h>
 

diff --git a/InfoScreen.c b/InfoScreen.c
@@ -6,7 +6,7 @@
 #include "IncSet.h"
 #include "ListItem.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/ListItem.c b/ListItem.c
@@ -8,8 +8,8 @@ in the source distribution for its full text.
 #include "ListItem.h"
 
 #include "CRT.h"
-#include "StringUtils.h"
 #include "RichString.h"
+#include "XUtils.h"
 
 #include <string.h>
 #include <assert.h>

diff --git a/LoadAverageMeter.c b/LoadAverageMeter.c
@@ -9,6 +9,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 
 static const int LoadAverageMeter_attributes[] = {

diff --git a/Makefile.am b/Makefile.am
@@ -56,14 +56,13 @@ myhtopsources = \
 	ScreenManager.c \
 	Settings.c \
 	SignalsPanel.c \
-	StringUtils.c \
 	SwapMeter.c \
 	TasksMeter.c \
 	TraceScreen.c \
 	UptimeMeter.c \
 	UsersTable.c \
 	Vector.c \
-	XAlloc.c
+	XUtils.c
 
 myhtopheaders = \
 	Action.h \
@@ -108,14 +107,13 @@ myhtopheaders = \
 	ScreenManager.h \
 	Settings.h \
 	SignalsPanel.h \
-	StringUtils.h \
 	SwapMeter.h \
 	TasksMeter.h \
 	TraceScreen.h \
 	UptimeMeter.h \
 	UsersTable.h \
 	Vector.h \
-	XAlloc.h
+	XUtils.h
 
 # Linux
 # -----

diff --git a/Meter.c b/Meter.c
@@ -10,8 +10,8 @@ in the source distribution for its full text.
 #include "RichString.h"
 #include "Object.h"
 #include "CRT.h"
-#include "StringUtils.h"
 #include "Settings.h"
+#include "XUtils.h"
 
 #include <math.h>
 #include <string.h>

diff --git a/Object.h b/Object.h
@@ -9,8 +9,9 @@ in the source distribution for its full text.
 */
 
 #include "RichString.h"
-#include "XAlloc.h"
 #include "Macros.h"
+#include "XUtils.h"
+
 
 typedef struct Object_ Object;
 

diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c
@@ -10,8 +10,8 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "ProcessList.h"
 #include "IncSet.h"
-#include "StringUtils.h"
 #include "FunctionBar.h"
+#include "XUtils.h"
 
 #include <string.h>
 #include <stdio.h>

diff --git a/Panel.c b/Panel.c
@@ -10,7 +10,7 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "RichString.h"
 #include "ListItem.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <math.h>
 #include <stdbool.h>

diff --git a/Process.c b/Process.c
@@ -12,9 +12,9 @@ in the source distribution for its full text.
 #include "config.h"
 
 #include "CRT.h"
-#include "StringUtils.h"
 #include "RichString.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <stdio.h>
 #include <sys/time.h>

diff --git a/ProcessList.c b/ProcessList.c
@@ -6,10 +6,10 @@ in the source distribution for its full text.
 */
 
 #include "ProcessList.h"
-#include "Platform.h"
 
 #include "CRT.h"
-#include "StringUtils.h"
+#include "Platform.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/RichString.c b/RichString.c
@@ -6,12 +6,13 @@ in the source distribution for its full text.
 */
 
 #include "RichString.h"
-#include "XAlloc.h"
 #include "Macros.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <string.h>
 
+
 #define charBytes(n) (sizeof(CharType) * (n))
 
 static void RichString_extendLen(RichString* this, int len) {

diff --git a/Settings.c b/Settings.c
@@ -6,11 +6,11 @@ in the source distribution for its full text.
 */
 
 #include "Settings.h"
-#include "Platform.h"
 
-#include "StringUtils.h"
-#include "Vector.h"
 #include "CRT.h"
+#include "Platform.h"
+#include "Vector.h"
+#include "XUtils.h"
 
 #include <sys/stat.h>
 #include <stdlib.h>

diff --git a/SignalsPanel.c b/SignalsPanel.c
@@ -7,16 +7,16 @@ in the source distribution for its full text.
 
 #include "Panel.h"
 #include "SignalsPanel.h"
-#include "Platform.h"
-
-#include "ListItem.h"
-#include "RichString.h"
 
-#include <stdlib.h>
 #include <assert.h>
+#include <ctype.h>
 #include <signal.h>
+#include <stdlib.h>
 
-#include <ctype.h>
+#include "ListItem.h"
+#include "Platform.h"
+#include "RichString.h"
+#include "XUtils.h"
 
 
 Panel* SignalsPanel_new() {

diff --git a/TasksMeter.c b/TasksMeter.c
@@ -7,8 +7,9 @@ in the source distribution for its full text.
 
 #include "TasksMeter.h"
 
-#include "Platform.h"
 #include "CRT.h"
+#include "Platform.h"
+#include "XUtils.h"
 
 
 static const int TasksMeter_attributes[] = {

diff --git a/TraceScreen.c b/TraceScreen.c
@@ -11,8 +11,8 @@ in the source distribution for its full text.
 #include "ProcessList.h"
 #include "ListItem.h"
 #include "IncSet.h"
-#include "StringUtils.h"
 #include "FunctionBar.h"
+#include "XUtils.h"
 
 #include <stdio.h>
 #include <unistd.h>