summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2020-09-15Bump version, changelog for minor htop-3.0.2 release3.0.2Nathan Scott
2020-09-15Revert the vim_mode setting for now, needs a rethinkNathan Scott
There have been too many bugs reported in vim_mode, and the proposed fixes are increasingly fragile - hence we have decided to back it out for now. For reference: https://github.com/htop-dev/htop/issues/69 https://github.com/htop-dev/htop/pull/37 https://github.com/htop-dev/htop/pull/106 The whitespace changes also arrived in commit 12805f61d not sure what that was about, but backed out as well.
2020-09-15Merge pull request #120 from cgzones/nullNathan Scott
Drop always true condition
2020-09-14Merge pull request #123 from hugomg/header-duplicatesNathan Scott
Clean up some code duplication in the header files
2020-09-14Merge pull request #127 from gh-fork-dump/openbsd-fixNathan Scott
fix building on openbsd due to remaining WhiteList
2020-09-14fix building on openbsd due to remaining WhiteListStephen Gregoratto
2020-09-12Remove some unused #includesHugo Musso Gualandi
As suggested by cppclean.
2020-09-12Merge identical ifdefs in Affinity.hHugo Musso Gualandi
2020-09-12Alignment tweakHugo Musso Gualandi
2020-09-12Clean up some code duplication in the header filesHugo Musso Gualandi
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-12Drop always true conditionChristian Göttsche
`env` is allocated by checked allocation functions and can not be NULL. This checks confuses clang analyzer and causes a null-dereference warning on `env[size-1]`.
2020-09-09Merge branch 'BenBE-avoid-shadowing'Nathan Scott
2020-09-09Merge branch 'avoid-shadowing' of https://github.com/BenBE/htop into ↵Nathan Scott
BenBE-avoid-shadowing
2020-09-09Merge branch 'rgouicem-master'Nathan Scott
2020-09-09Merge branch 'master' of https://github.com/rgouicem/htop into rgouicem-masterNathan Scott
2020-09-09Switch variable/field naming from WhiteList to MatchListNathan Scott
2020-09-09Consolidate repeated macro definitions into one headerNathan Scott
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-08Further, minor cleanups to headers post-MakeHeadersNathan Scott
Remove leftover empty ifdef/endif pairs, whitespace. The generated htop.h file was also unused - removed.
2020-09-08Merge branch 'noheadergen' of https://github.com/zevweiss/htop into ↵Nathan Scott
zevweiss-noheadergen
2020-09-07Avoid shadowing of variablesBenny Baumann
2020-09-07Merge branch 't6-patch-freebsd-ci'Nathan Scott
2020-09-07Merge branch 'patch-freebsd-ci' of https://github.com/t6/htop-1 into ↵Nathan Scott
t6-patch-freebsd-ci
2020-09-05fix for double symbol link error on solarisDominik Hassler
2020-09-05htop should report the nice level properlyDominik Hassler
2020-09-04Fix regression in -u optional-argument handlingNathan Scott
Resolves https://github.com/htop-dev/htop/issues/91
2020-09-03Remove duplicate jail_errmsg declaration.Zev Weiss
Fixes: 11ecc65ebb1527e9a83f67bb5ac0dec455cb03e6
2020-09-03Remove superfluous 'extern's from function declarations.Zev Weiss
Applied via: $ find * -name '*.h' -exec sed -i -r 's/^extern (.+\()/\1/;' {} + Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
2020-09-03Axe automated header generation.Zev Weiss
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-03Add FreeBSD to TravisTobias Kortkamp
Signed-off-by: Tobias Kortkamp <t@tobik.me>
2020-09-03Merge pull request #86 from t6/patch-freebsd-fno-commonNathan Scott
Unbreak with -fno-common on FreeBSD
2020-09-03Unbreak with -fno-common on FreeBSDTobias Kortkamp
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-03Bump version, changelog for minor htop-3.0.1 release3.0.1Nathan Scott
2020-09-03Merge pull request #66 from ioquatix/patch-1Nathan Scott
Fix image logo and titles.
2020-09-03Merge pull request #57 from matthiasbeyer/patch-1Nathan Scott
Do not link INSTALL file, because link target does not exist
2020-09-02Merge branch 'eworm-de-unicode-runtime'Nathan Scott
2020-09-02Fix image logo and titles.Samuel Williams
2020-09-01Do not link INSTALL file, because link target does not existMatthias Beyer
2020-09-01add option (-U, --no-unicode) to disable unicode at runtimeChristian Hesse
2020-09-01Merge branch 'cgzones-oom2'Nathan Scott
2020-09-01Merge branch 'oom2' of https://github.com/cgzones/htop into cgzones-oom2Nathan Scott
2020-08-31CRT: note about possible use of replacement for `+` glyph in treeBert Wesarg
2020-08-31affinity panel: use the tree collapsing as in the process listBert Wesarg
With one exception, the root node does also have a `-`/`+` as a prefix.
2020-08-31affinity panel: show CPUs in the topology tree as `CPU x`Bert Wesarg
As it is in the non-topology list.
2020-08-31Revert "Use UTF-8 for check buttons and tree open/closed"Bert Wesarg
This reverts commit 5d5913d355b3a9f03da589b3542b8f55467b4ed6.
2020-08-31fix unit (GHz -> MHz)Redha Gouicem
2020-08-31fixed compilation errorRedha Gouicem
2020-08-31remove unused variableRedha Gouicem
2020-08-31Reduce oom cast from long to intChristian Göttsche
Oom values should never be greater then INT_MAX, they should be in the range 0 - 1000. Improves: d9a5dd4b916636b5e7ba8631885427372f0cfcad
2020-08-31Merge branch 'configure' of https://github.com/cgzones/htop into ↵Nathan Scott
cgzones-configure
2020-08-31Merge branch 'master' of github.com:htop-dev/htopNathan Scott
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 22:23:29 +0000