Rename StringUtils.[ch] to XUtils.[ch]

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>

AffinityPanel.c

@@ -13,8 +13,8 @@ in the source distribution for its full text.
 #include <string.h>
 
 #include "CRT.h"
-#include "StringUtils.h"
 #include "Vector.h"
+#include "XUtils.h"
 
 #ifdef HAVE_LIBHWLOC
 #include <hwloc.h>

AvailableColumnsPanel.c

@@ -15,7 +15,7 @@ in the source distribution for its full text.
 #include "ColumnsPanel.h"
 #include "Header.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const char* const AvailableColumnsFunctions[] = {"      ", "      ", "      ", "      ", "Add   ", "      ", "      ", "      ", "      ", "Done  ", NULL};

AvailableMetersPanel.c

@@ -12,7 +12,7 @@ in the source distribution for its full text.
 #include "Header.h"
 #include "ListItem.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <stdlib.h>

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>

CPUMeter.c

@@ -10,7 +10,7 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Settings.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <stdlib.h>

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>

ColorsPanel.c

@@ -9,7 +9,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "CheckItem.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <stdlib.h>

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"
 

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>

DiskIOMeter.c

@@ -11,7 +11,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const int DiskIOMeter_attributes[] = {

DisplayOptionsPanel.c

@@ -13,7 +13,7 @@ in the source distribution for its full text.
 
 #include "CheckItem.h"
 #include "CRT.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const char* const DisplayOptionsFunctions[] = {"      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "      ", "Done  ", NULL};

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>

FunctionBar.c

@@ -8,8 +8,8 @@ in the source distribution for its full text.
 #include "FunctionBar.h"
 #include "CRT.h"
 #include "RichString.h"
-#include "StringUtils.h"
 #include "XAlloc.h"
+#include "XUtils.h"
 
 #include <assert.h>
 #include <string.h>

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>

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>
 

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>

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>

LoadAverageMeter.c

@@ -9,7 +9,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const int LoadAverageMeter_attributes[] = {

Makefile.am

@@ -56,14 +56,14 @@ myhtopsources = \
 	ScreenManager.c \
 	Settings.c \
 	SignalsPanel.c \
-	StringUtils.c \
 	SwapMeter.c \
 	TasksMeter.c \
 	TraceScreen.c \
 	UptimeMeter.c \
 	UsersTable.c \
 	Vector.c \
-	XAlloc.c
+	XAlloc.c \
+	XUtils.c
 
 myhtopheaders = \
 	Action.h \
@@ -108,14 +108,14 @@ myhtopheaders = \
 	ScreenManager.h \
 	Settings.h \
 	SignalsPanel.h \
-	StringUtils.h \
 	SwapMeter.h \
 	TasksMeter.h \
 	TraceScreen.h \
 	UptimeMeter.h \
 	UsersTable.h \
 	Vector.h \
-	XAlloc.h
+	XAlloc.h \
+	XUtils.h
 
 # Linux
 # -----

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>

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>

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>

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>

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>

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>

SignalsPanel.c

@@ -16,7 +16,7 @@ in the source distribution for its full text.
 #include "ListItem.h"
 #include "Platform.h"
 #include "RichString.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 Panel* SignalsPanel_new() {

TasksMeter.c

@@ -9,7 +9,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const int TasksMeter_attributes[] = {

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>

UptimeMeter.c

@@ -9,7 +9,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const int UptimeMeter_attributes[] = {

UsersTable.c

@@ -17,8 +17,8 @@ in the source distribution for its full text.
 #include <stdlib.h>
 #include <assert.h>
 
-#include "StringUtils.h"
 #include "XAlloc.h"
+#include "XUtils.h"
 
 
 UsersTable* UsersTable_new() {

XUtils.c

@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "config.h"
 
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <stdarg.h>
 #include <stdlib.h>

XUtils.h

@@ -1,5 +1,5 @@
-#ifndef HEADER_StringUtils
+#ifndef HEADER_XUtils
-#define HEADER_StringUtils
+#define HEADER_XUtils
 /*
 htop - StringUtils.h
 (C) 2004-2011 Hisham H. Muhammad

htop.c

@@ -16,9 +16,9 @@ in the source distribution for its full text.
 #include "ProcessList.h"
 #include "ScreenManager.h"
 #include "Settings.h"
-#include "StringUtils.h"
 #include "UsersTable.h"
 #include "Platform.h"
+#include "XUtils.h"
 
 #include <getopt.h>
 #include <locale.h>

linux/Battery.c

@@ -7,11 +7,10 @@ in the source distribution for its full text.
 Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Battery.h"
 
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
@@ -20,7 +19,9 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat
 #include <fcntl.h>
 #include <time.h>
 #include <math.h>
-#include "StringUtils.h"
+
+#include "XUtils.h"
+
 
 #define SYS_POWERSUPPLY_DIR "/sys/class/power_supply"
 

linux/IOPriorityPanel.c

@@ -7,7 +7,7 @@ in the source distribution for its full text.
 
 #include "IOPriorityPanel.h"
 
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 Panel* IOPriorityPanel_new(IOPriority currPrio) {

linux/LinuxProcess.c

@@ -11,7 +11,7 @@ in the source distribution for its full text.
 #include "LinuxProcess.h"
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -20,6 +20,7 @@ in the source distribution for its full text.
 #include <time.h>
 #include <math.h>
 
+
 /* semi-global */
 long long btime;
 

linux/LinuxProcessList.c

@@ -8,7 +8,8 @@ in the source distribution for its full text.
 #include "LinuxProcessList.h"
 #include "LinuxProcess.h"
 #include "CRT.h"
-#include "StringUtils.h"
+#include "XUtils.h"
+
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/utsname.h>

linux/Platform.c

@@ -30,7 +30,7 @@ in the source distribution for its full text.
 #include "zfs/ZfsCompressedArcMeter.h"
 #include "LinuxProcess.h"
 #include "SELinuxMeter.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <math.h>
 #include <assert.h>

linux/PressureStallMeter.c

@@ -12,7 +12,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 
 static const int PressureStallMeter_attributes[] = {

zfs/ZfsCompressedArcMeter.c

@@ -10,7 +10,7 @@ in the source distribution for its full text.
 
 #include "CRT.h"
 #include "Platform.h"
-#include "StringUtils.h"
+#include "XUtils.h"
 
 #include <stdlib.h>
 #include <string.h>