diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2021-08-08 15:10:34 +0200 |
|---|---|---|
| committer | Christian Göttsche <cgzones@googlemail.com> | 2021-08-08 15:10:58 +0200 |
| commit | 10e9ffd8e5c353e8a04acbdfcaf0495bd130e96c (patch) | |
| tree | 569df9bd272cba9798a4dd924f6a1351acc7d0f6 | |
| parent | 97a859c5bd8201911d4492e2440af1227527352d (diff) | |
Fix misc typos
[ci skip]
| -rw-r--r-- | docs/styleguide.md | 2 | ||||
| -rw-r--r-- | linux/LinuxProcessList.c | 2 | ||||
| -rw-r--r-- | solaris/SolarisProcessList.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/styleguide.md b/docs/styleguide.md index 3757efe9..d8fe2644 100644 --- a/docs/styleguide.md +++ b/docs/styleguide.md @@ -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. diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index e5d38e5a..e1b923d6 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -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 */ diff --git a/solaris/SolarisProcessList.c b/solaris/SolarisProcessList.c index 63b1db80..3251a333 100644 --- a/solaris/SolarisProcessList.c +++ b/solaris/SolarisProcessList.c @@ -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) { |