ccf0960d5c
Merge pull request #123 from hugomg/header-duplicates
...
Clean up some code duplication in the header files
2020-09-14 17:46:18 +10:00
313d7c980c
Merge pull request #127 from gh-fork-dump/openbsd-fix
...
fix building on openbsd due to remaining WhiteList
2020-09-14 17:42:23 +10:00
fd4ada416d
fix building on openbsd due to remaining WhiteList
2020-09-14 13:18:40 +10:00
b6828d7b86
Remove some unused #includes
...
As suggested by cppclean.
2020-09-12 23:32:31 -03:00
a2ef400e43
Merge identical ifdefs in Affinity.h
2020-09-12 19:21:27 -03:00
5ad3c11eaa
Alignment tweak
2020-09-12 19:21:27 -03:00
9207401f97
Clean up some code duplication in the header files
...
PR htop-dev/htop#70 got rid of the infrastructure for generating header
files, but it left behind some code duplication.
Some of cases are things that belong in the header file and don't need
to be repeated in the C file. Other cases are things that belong in the
C file and don't need to be in the header file.
In this commit I tried to fix all of these that I could find. When given
a choice I preferred keeping things out of the header file, unless they
were being used by someone else.
2020-09-12 19:20:44 -03:00
cd55cfd6d2
Merge branch 'BenBE-avoid-shadowing'
2020-09-09 19:41:16 +10:00
35c3a95ff9
Merge branch 'avoid-shadowing' of https://github.com/BenBE/htop into BenBE-avoid-shadowing
2020-09-09 19:40:50 +10:00
06ba81beec
Merge branch 'rgouicem-master'
2020-09-09 19:38:59 +10:00
4d6e4ef53c
Merge branch 'master' of https://github.com/rgouicem/htop into rgouicem-master
2020-09-09 19:38:53 +10:00
4597332959
Switch variable/field naming from WhiteList to MatchList
2020-09-09 19:38:15 +10:00
c5808c56db
Consolidate repeated macro definitions into one header
...
The MIN, MAX, CLAMP, MINIMUM, and MAXIMUM macros appear
throughout the codebase with many re-definitions. Make
a single copy of each in a common header file, and use
the BSD variants of MINIMUM/MAXIMUM due to conflicts in
the system <sys/param.h> headers.
2020-09-09 16:56:04 +10:00
8ec5d4a3a0
Further, minor cleanups to headers post-MakeHeaders
...
Remove leftover empty ifdef/endif pairs, whitespace.
The generated htop.h file was also unused - removed.
2020-09-08 17:33:50 +10:00
eede79b29a
Merge branch 'noheadergen' of https://github.com/zevweiss/htop into zevweiss-noheadergen
2020-09-08 16:45:11 +10:00
13b1e96b12
Avoid shadowing of variables
2020-09-07 17:36:01 +02:00
85ff6960ed
Merge branch 't6-patch-freebsd-ci'
2020-09-07 10:25:50 +10:00
a1f2532630
Merge branch 'patch-freebsd-ci' of https://github.com/t6/htop-1 into t6-patch-freebsd-ci
2020-09-07 10:25:44 +10:00
7805575114
fix for double symbol link error on solaris
2020-09-05 15:34:27 +10:00
f884beda97
htop should report the nice level properly
2020-09-05 15:29:15 +10:00
0750ff7e76
Fix regression in -u optional-argument handling
...
Resolves https://github.com/htop-dev/htop/issues/91
2020-09-04 09:50:18 +10:00
7758ffcdea
Remove duplicate jail_errmsg declaration.
...
Fixes: 11ecc65ebb
2020-09-03 12:00:21 -05:00
7b7822b896
Remove superfluous 'extern's from function declarations.
...
Applied via:
$ find * -name '*.h' -exec sed -i -r 's/^extern (.+\()/\1/;' {} +
Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com >
2020-09-03 11:59:26 -05:00
a1a027b9bd
Axe automated header generation.
...
Reasoning:
- implementation was unsound -- broke down when I added a fairly
basic macro definition expanding to a struct initializer in a *.c
file.
- made it way too easy (e.g. via otherwise totally innocuous git
commands) to end up with timestamps such that it always ran
MakeHeader.py but never used its output, leading to overbuild noise
when running what should be a null 'make'.
- but mostly: it's just an awkward way of dealing with C code.
2020-09-03 11:58:58 -05:00
35d7e42b88
Add FreeBSD to Travis
...
Signed-off-by: Tobias Kortkamp <t@tobik.me >
2020-09-03 09:00:17 +02:00
7734dfe55d
Merge pull request #86 from t6/patch-freebsd-fno-common
...
Unbreak with -fno-common on FreeBSD
2020-09-03 16:47:30 +10:00
11ecc65ebb
Unbreak with -fno-common on FreeBSD
...
GCC10 and Clang11 now default to -fno-common.
ld: error: duplicate symbol: jail_errmsg
>>> defined at Platform.c
>>> freebsd/Platform.o:(jail_errmsg)
>>> defined at FreeBSDProcessList.c
>>> freebsd/FreeBSDProcessList.o:(.bss+0x90)
Signed-off-by: Tobias Kortkamp <t@tobik.me >
2020-09-03 08:42:18 +02:00
dace850fa6
Bump version, changelog for minor htop-3.0.1 release
2020-09-03 13:23:43 +10:00
4f00a95364
Merge pull request #66 from ioquatix/patch-1
...
Fix image logo and titles.
2020-09-03 08:35:19 +10:00
0ab508e42b
Merge pull request #57 from matthiasbeyer/patch-1
...
Do not link INSTALL file, because link target does not exist
2020-09-03 08:20:36 +10:00
f79591ef1b
Merge branch 'eworm-de-unicode-runtime'
2020-09-02 15:09:58 +10:00
746a5f279a
Fix image logo and titles.
2020-09-02 11:54:17 +12:00
8ee7d58cb0
Do not link INSTALL file, because link target does not exist
2020-09-01 14:47:00 +02:00
db5adbeae0
add option (-U, --no-unicode) to disable unicode at runtime
2020-09-01 10:09:00 +02:00
f5b3e8d2a3
Merge branch 'cgzones-oom2'
2020-09-01 15:17:32 +10:00
809e4db672
Merge branch 'oom2' of https://github.com/cgzones/htop into cgzones-oom2
2020-09-01 15:17:23 +10:00
e1e60f38dc
CRT: note about possible use of replacement for + glyph in tree
2020-08-31 22:35:09 +02:00
19359cec5a
affinity panel: use the tree collapsing as in the process list
...
With one exception, the root node does also have a `-`/`+` as a prefix.
2020-08-31 22:22:22 +02:00
b0f1336f79
affinity panel: show CPUs in the topology tree as CPU x
...
As it is in the non-topology list.
2020-08-31 22:18:18 +02:00
f861a2c616
Revert "Use UTF-8 for check buttons and tree open/closed"
...
This reverts commit 5d5913d355b3a9f03da589b3542b8f55467b4ed6.
2020-08-31 22:12:46 +02:00
d0e8ff9319
fix unit (GHz -> MHz)
2020-08-31 14:09:22 +02:00
0f5d2cd1e4
fixed compilation error
2020-08-31 13:32:29 +02:00
293e3a2931
remove unused variable
2020-08-31 13:29:24 +02:00
e7f6d1ce5f
Reduce oom cast from long to int
...
Oom values should never be greater then INT_MAX, they should be in the
range 0 - 1000.
Improves: d9a5dd4b91
2020-08-31 11:55:53 +02:00
47a7d0bd74
Merge branch 'configure' of https://github.com/cgzones/htop into cgzones-configure
2020-08-31 17:13:37 +10:00
b321177b08
Merge branch 'master' of github.com:htop-dev/htop
2020-08-31 16:57:46 +10:00
800d8c735d
Merge branch 'cov_fixes' of https://github.com/cgzones/htop into cgzones-cov_fixes
2020-08-31 16:56:32 +10:00
f14173038e
Merge branch 'oom' of https://github.com/cgzones/htop
...
Closes : #18 , #22
2020-08-31 08:32:39 +02:00
fdf8a28e60
Merge branch 'Ckath-vim_mode_setting'
2020-08-31 16:14:48 +10:00
244630f67f
Merge branch 'vim_mode_setting' of https://github.com/Ckath/htop into Ckath-vim_mode_setting
2020-08-31 16:14:40 +10:00
