From 5e602f18d5f619f7dba6d9fccefacdb991db391d Mon Sep 17 00:00:00 2001 From: David Hunt Date: Wed, 19 Aug 2015 13:43:20 -0300 Subject: [PATCH] Rename String to StringUtils. Fixes building on case-insensitive filesystems where String.h gets confused with . From d734dacea0a10d0465dad4e95b3421511e7da112 Mon Sep 17 00:00:00 2001 From: David Hunt Date: Sat, 11 Jul 2015 20:56:31 -0500 Subject: [PATCH 1/8] Rename String to StringUtils --- Action.c | 2 +- BatteryMeter.c | 2 +- CRT.c | 2 +- ColumnsPanel.c | 2 +- Header.c | 2 +- IncSet.c | 2 +- ListItem.c | 2 +- Makefile.am | 12 ++++++------ Meter.c | 2 +- OpenFilesScreen.c | 2 +- Panel.c | 2 +- Process.c | 2 +- ProcessList.c | 2 +- Settings.c | 2 +- String.c => StringUtils.c | 2 +- String.h => StringUtils.h | 4 ++-- TraceScreen.c | 2 +- linux/Battery.c | 2 +- linux/LinuxProcessList.c | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) rename String.c => StringUtils.c (99%) rename String.h => StringUtils.h (92%) diff --git a/Action.c b/Action.c index 19cc7e35..aee28f3d 100644 --- a/Action.c +++ b/Action.c @@ -17,7 +17,7 @@ in the source distribution for its full text. #include "Process.h" #include "ScreenManager.h" #include "SignalsPanel.h" -#include "String.h" +#include "StringUtils.h" #include "TraceScreen.h" #include "Platform.h" diff --git a/BatteryMeter.c b/BatteryMeter.c index cea77866..5fda38b1 100644 --- a/BatteryMeter.c +++ b/BatteryMeter.c @@ -12,7 +12,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com). #include "Battery.h" #include "ProcessList.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include "Platform.h" #include diff --git a/CRT.c b/CRT.c index 03f71ca7..b44a86b6 100644 --- a/CRT.c +++ b/CRT.c @@ -7,7 +7,7 @@ in the source distribution for its full text. #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include "RichString.h" #include diff --git a/ColumnsPanel.c b/ColumnsPanel.c index 918ee320..a7856b41 100644 --- 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 "String.h" +#include "StringUtils.h" #include "ListItem.h" #include diff --git a/Header.c b/Header.c index 303928cd..1d4634f0 100644 --- a/Header.c +++ b/Header.c @@ -8,7 +8,7 @@ in the source distribution for its full text. #include "Header.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include "Platform.h" #include diff --git a/IncSet.c b/IncSet.c index 2eb77ef4..2b1ad392 100644 --- a/IncSet.c +++ b/IncSet.c @@ -6,7 +6,7 @@ in the source distribution for its full text. */ #include "IncSet.h" -#include "String.h" +#include "StringUtils.h" #include "Panel.h" #include "ListItem.h" #include "CRT.h" diff --git a/ListItem.c b/ListItem.c index eddcd875..68fd9ffe 100644 --- a/ListItem.c +++ b/ListItem.c @@ -8,7 +8,7 @@ in the source distribution for its full text. #include "ListItem.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include "RichString.h" #include diff --git a/Makefile.am b/Makefile.am index d47f755a..46377fc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ applications_DATA = htop.desktop pixmapdir = $(datadir)/pixmaps pixmap_DATA = htop.png -htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(my_htop_platform)" +htop_CFLAGS = -pedantic -Wall $(wextra_flag) -std=c99 -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR=\"$(sysconfdir)\" -I"$(top_srcdir)/$(my_htop_platform)" AM_CPPFLAGS = -DNDEBUG myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \ @@ -20,8 +20,8 @@ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.c \ DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \ LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.c \ BatteryMeter.c Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \ -SignalsPanel.c String.c SwapMeter.c TasksMeter.c UptimeMeter.c TraceScreen.c \ -UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \ +SignalsPanel.c StringUtils.c SwapMeter.c TasksMeter.c UptimeMeter.c \ +TraceScreen.c UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \ HostnameMeter.c OpenFilesScreen.c Affinity.c IncSet.c Action.c myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \ @@ -29,9 +29,9 @@ CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \ CPUMeter.h CRT.h MainPanel.h DisplayOptionsPanel.h FunctionBar.h \ Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.h \ BatteryMeter.h Meter.h MetersPanel.h Object.h Panel.h ProcessList.h RichString.h \ -ScreenManager.h Settings.h SignalsPanel.h String.h SwapMeter.h TasksMeter.h \ -UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h AffinityPanel.h \ -HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h +ScreenManager.h Settings.h SignalsPanel.h StringUtils.h SwapMeter.h \ +TasksMeter.h UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h \ +AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h if HTOP_LINUX htop_CFLAGS += -rdynamic diff --git a/Meter.c b/Meter.c index 51e5258e..6e56e36a 100644 --- a/Meter.c +++ b/Meter.c @@ -10,7 +10,7 @@ in the source distribution for its full text. #include "RichString.h" #include "Object.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include "ListItem.h" #include "Settings.h" diff --git a/OpenFilesScreen.c b/OpenFilesScreen.c index 296fdaf7..86eb3f8e 100644 --- a/OpenFilesScreen.c +++ b/OpenFilesScreen.c @@ -11,7 +11,7 @@ in the source distribution for its full text. #include "ProcessList.h" #include "ListItem.h" #include "IncSet.h" -#include "String.h" +#include "StringUtils.h" #include "FunctionBar.h" #include diff --git a/Panel.c b/Panel.c index c4265266..08d04022 100644 --- 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 "String.h" +#include "StringUtils.h" #include #include diff --git a/Process.c b/Process.c index 6c75d92f..0aade6df 100644 --- a/Process.c +++ b/Process.c @@ -9,7 +9,7 @@ in the source distribution for its full text. #include "Settings.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include "RichString.h" #include "Platform.h" diff --git a/ProcessList.c b/ProcessList.c index 050b74fa..e9bff680 100644 --- a/ProcessList.c +++ b/ProcessList.c @@ -9,7 +9,7 @@ in the source distribution for its full text. #include "Platform.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include #include diff --git a/Settings.c b/Settings.c index 8132ae78..65e49bfc 100644 --- a/Settings.c +++ b/Settings.c @@ -8,7 +8,7 @@ in the source distribution for its full text. #include "Settings.h" #include "Platform.h" -#include "String.h" +#include "StringUtils.h" #include "Vector.h" #include "CRT.h" diff --git a/String.c b/StringUtils.c similarity index 99% rename from String.c rename to StringUtils.c index cbfd6877..5d1cc165 100644 --- a/String.c +++ b/StringUtils.c @@ -5,7 +5,7 @@ Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ -#include "String.h" +#include "StringUtils.h" #include "config.h" diff --git a/String.h b/StringUtils.h similarity index 92% rename from String.h rename to StringUtils.h index cb7f1acc..5f8cb927 100644 --- a/String.h +++ b/StringUtils.h @@ -1,7 +1,7 @@ /* Do not edit this file. It was automatically generated. */ -#ifndef HEADER_String -#define HEADER_String +#ifndef HEADER_StringUtils +#define HEADER_StringUtils /* htop - String.h (C) 2004-2011 Hisham H. Muhammad diff --git a/TraceScreen.c b/TraceScreen.c index 197a0fd1..48107438 100644 --- a/TraceScreen.c +++ b/TraceScreen.c @@ -11,7 +11,7 @@ in the source distribution for its full text. #include "ProcessList.h" #include "ListItem.h" #include "IncSet.h" -#include "String.h" +#include "StringUtils.h" #include "FunctionBar.h" #include diff --git a/linux/Battery.c b/linux/Battery.c index 532c118b..ebf20372 100644 --- a/linux/Battery.c +++ b/linux/Battery.c @@ -18,7 +18,7 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat #include #include #include "BatteryMeter.h" -#include "String.h" +#include "StringUtils.h" #define SYS_POWERSUPPLY_DIR "/sys/class/power_supply" diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index d532c4c3..299cb861 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -8,7 +8,7 @@ in the source distribution for its full text. #include "LinuxProcessList.h" #include "LinuxProcess.h" #include "CRT.h" -#include "String.h" +#include "StringUtils.h" #include #include #include