mirror of https://github.com/xzeldon/htop.git
parent
97a859c5bd
commit
10e9ffd8e5
|
@ -230,7 +230,7 @@ When writing your PR or patch, the set of patches should contain the minimal cha
|
|||
Each patch in itself should ideally be self-contained and runable.
|
||||
|
||||
A PR should not contain any merge commits.
|
||||
To follow the uptream branch of your PR rebase your work instead.
|
||||
To follow the upstream branch of your PR rebase your work instead.
|
||||
|
||||
Avoid small commits that just fix typos that another of your commits introduced.
|
||||
Instead squash those changes in the appropriate commit that introduced that mistake.
|
||||
|
|
|
@ -159,7 +159,7 @@ static void LinuxProcessList_initNetlinkSocket(LinuxProcessList* this) {
|
|||
#endif
|
||||
|
||||
static void LinuxProcessList_updateCPUcount(ProcessList* super) {
|
||||
/* Similiar to get_nprocs_conf(3) / _SC_NPROCESSORS_CONF
|
||||
/* Similar to get_nprocs_conf(3) / _SC_NPROCESSORS_CONF
|
||||
* https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/getsysstats.c;hb=HEAD
|
||||
*/
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ static void SolarisProcessList_updateCPUcount(ProcessList* super) {
|
|||
|
||||
s = sysconf(_SC_NPROCESSORS_CONF);
|
||||
if (s < 1)
|
||||
CRT_fatalError("Cannot get exisitng CPU count by sysconf(_SC_NPROCESSORS_CONF)");
|
||||
CRT_fatalError("Cannot get existing CPU count by sysconf(_SC_NPROCESSORS_CONF)");
|
||||
|
||||
if (s != super->existingCPUs) {
|
||||
if (s == 1) {
|
||||
|
|
Loading…
Reference in New Issue