zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename String to StringUtils. 

Fixes building on case-insensitive filesystems where String.h gets confused with <string.h>.

From d734dacea0a10d0465dad4e95b3421511e7da112 Mon Sep 17 00:00:00 2001
From: David Hunt <dhunt@iolanthe.attlocal.net>
Date: Sat, 11 Jul 2015 20:56:31 -0500
Subject: [PATCH 1/8] Rename String to StringUtils
This commit is contained in:
David Hunt 2015-08-19 13:43:20 -03:00 committed by Hisham Muhammad
parent f2c053a884
commit 5e602f18d5
19 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Action.c
View File

@ -17,7 +17,7 @@ in the source distribution for its full text.
#include "Process.h" #include "Process.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "SignalsPanel.h" #include "SignalsPanel.h"
#include "String.h" #include "StringUtils.h"
#include "TraceScreen.h" #include "TraceScreen.h"
#include "Platform.h" #include "Platform.h"

2
BatteryMeter.c
View File

@ -12,7 +12,7 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
#include "Battery.h" #include "Battery.h"
#include "ProcessList.h" #include "ProcessList.h"
#include "CRT.h" #include "CRT.h"
#include "String.h" #include "StringUtils.h"
#include "Platform.h" #include "Platform.h"
#include <string.h> #include <string.h>

2
CRT.c
View File

@ -7,7 +7,7 @@ in the source distribution for its full text.
#include "CRT.h" #include "CRT.h"
#include "String.h" #include "StringUtils.h"
#include "RichString.h" #include "RichString.h"
#include <stdio.h> #include <stdio.h>

2
ColumnsPanel.c
View File

@ -8,7 +8,7 @@ in the source distribution for its full text.
#include "ColumnsPanel.h" #include "ColumnsPanel.h"
#include "Platform.h" #include "Platform.h"
#include "String.h" #include "StringUtils.h"
#include "ListItem.h" #include "ListItem.h"
#include <assert.h> #include <assert.h>

2
Header.c
View File

@ -8,7 +8,7 @@ in the source distribution for its full text.
#include "Header.h" #include "Header.h"
#include "CRT.h" #include "CRT.h"
#include "String.h" #include "StringUtils.h"
#include "Platform.h" #include "Platform.h"
#include <assert.h> #include <assert.h>

2
IncSet.c
View File

@ -6,7 +6,7 @@ in the source distribution for its full text.
*/ */
#include "IncSet.h" #include "IncSet.h"
#include "String.h" #include "StringUtils.h"
#include "Panel.h" #include "Panel.h"
#include "ListItem.h" #include "ListItem.h"
#include "CRT.h" #include "CRT.h"

2
ListItem.c
View File

@ -8,7 +8,7 @@ in the source distribution for its full text.
#include "ListItem.h" #include "ListItem.h"
#include "CRT.h" #include "CRT.h"
#include "String.h" #include "StringUtils.h"
#include "RichString.h" #include "RichString.h"
#include <string.h> #include <string.h>

12
Makefile.am
View File

@ -12,7 +12,7 @@ applications_DATA = htop.desktop
pixmapdir = $(datadir)/pixmaps pixmapdir = $(datadir)/pixmaps
pixmap_DATA = htop.png 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 AM_CPPFLAGS = -DNDEBUG
myhtopsources = AvailableMetersPanel.c CategoriesPanel.c CheckItem.c \ 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 \ DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \
LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.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 \ BatteryMeter.c Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \
SignalsPanel.c String.c SwapMeter.c TasksMeter.c UptimeMeter.c TraceScreen.c \ SignalsPanel.c StringUtils.c SwapMeter.c TasksMeter.c UptimeMeter.c \
UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \ TraceScreen.c UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \
HostnameMeter.c OpenFilesScreen.c Affinity.c IncSet.c Action.c HostnameMeter.c OpenFilesScreen.c Affinity.c IncSet.c Action.c
myhtopheaders = AvailableColumnsPanel.h AvailableMetersPanel.h \ 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 \ CPUMeter.h CRT.h MainPanel.h DisplayOptionsPanel.h FunctionBar.h \
Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.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 \ 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 \ ScreenManager.h Settings.h SignalsPanel.h StringUtils.h SwapMeter.h \
UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h AffinityPanel.h \ TasksMeter.h UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h \
HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h
if HTOP_LINUX if HTOP_LINUX
htop_CFLAGS += -rdynamic htop_CFLAGS += -rdynamic

2
Meter.c
View File

@ -10,7 +10,7 @@ in the source distribution for its full text.
#include "RichString.h" #include "RichString.h"
#include "Object.h" #include "Object.h"
#include "CRT.h" #include "CRT.h"
#include "String.h" #include "StringUtils.h"
#include "ListItem.h" #include "ListItem.h"
#include "Settings.h" #include "Settings.h"

2
OpenFilesScreen.c
View File

@ -11,7 +11,7 @@ in the source distribution for its full text.
#include "ProcessList.h" #include "ProcessList.h"
#include "ListItem.h" #include "ListItem.h"
#include "IncSet.h" #include "IncSet.h"
#include "String.h" #include "StringUtils.h"
#include "FunctionBar.h" #include "FunctionBar.h"
#include <string.h> #include <string.h>

2
Panel.c
View File

@ -10,7 +10,7 @@ in the source distribution for its full text.
#include "CRT.h" #include "CRT.h"
#include "RichString.h" #include "RichString.h"
#include "ListItem.h" #include "ListItem.h"
#include "String.h" #include "StringUtils.h"
#include <math.h> #include <math.h>
#include <stdbool.h> #include <stdbool.h>

2
Process.c
View File

@ -9,7 +9,7 @@ in the source distribution for its full text.
#include "Settings.h" #include "Settings.h"
#include "CRT.h" #include "CRT.h"
#include "String.h" #include "StringUtils.h"
#include "RichString.h" #include "RichString.h"
#include "Platform.h" #include "Platform.h"

2
ProcessList.c
View File

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

2
Settings.c
View File

@ -8,7 +8,7 @@ in the source distribution for its full text.
#include "Settings.h" #include "Settings.h"
#include "Platform.h" #include "Platform.h"
#include "String.h" #include "StringUtils.h"
#include "Vector.h" #include "Vector.h"
#include "CRT.h" #include "CRT.h"

2
String.c → StringUtils.c
View File

@ -5,7 +5,7 @@ Released under the GNU GPL, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include "String.h" #include "StringUtils.h"
#include "config.h" #include "config.h"

4
String.h → StringUtils.h
View File

@ -1,7 +1,7 @@
/* Do not edit this file. It was automatically generated. */ /* Do not edit this file. It was automatically generated. */
#ifndef HEADER_String #ifndef HEADER_StringUtils
#define HEADER_String #define HEADER_StringUtils
/* /*
htop - String.h htop - String.h
(C) 2004-2011 Hisham H. Muhammad (C) 2004-2011 Hisham H. Muhammad

2
TraceScreen.c
View File

@ -11,7 +11,7 @@ in the source distribution for its full text.
#include "ProcessList.h" #include "ProcessList.h"
#include "ListItem.h" #include "ListItem.h"
#include "IncSet.h" #include "IncSet.h"
#include "String.h" #include "StringUtils.h"
#include "FunctionBar.h" #include "FunctionBar.h"
#include <stdio.h> #include <stdio.h>

2
linux/Battery.c
View File

@ -18,7 +18,7 @@ Linux battery readings written by Ian P. Hands (iphands@gmail.com, ihands@redhat
#include <fcntl.h> #include <fcntl.h>
#include <time.h> #include <time.h>
#include "BatteryMeter.h" #include "BatteryMeter.h"
#include "String.h" #include "StringUtils.h"
#define SYS_POWERSUPPLY_DIR "/sys/class/power_supply" #define SYS_POWERSUPPLY_DIR "/sys/class/power_supply"

2
linux/LinuxProcessList.c
View File

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