From 2899ed4cb00f4d887ee92c91e274ef098fd14f2b Mon Sep 17 00:00:00 2001
From: Zev Weiss <zev@bewilderbeest.net>
Date: Thu, 19 Dec 2019 16:30:45 -0600
Subject: Number CPUs from zero by default.

Numbering from one is idiosyncratic and inconsistent with basically
everything else in the world; it doesn't make much sense as default
behavior.

All naming is updated to reflect that numbering from one is a
non-default, opt-in option.  The old label of the flag saved in htoprc
("cpu_count_from_zero") is still supported for backwards compatibility
with existing configs, however.
---
 Settings.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Settings.h')

diff --git a/Settings.h b/Settings.h
index e1518eca..e40682a3 100644
--- a/Settings.h
+++ b/Settings.h
@@ -31,7 +31,7 @@ typedef struct Settings_ {
    int direction;
    ProcessField sortKey;
 
-   bool countCPUsFromZero;
+   bool countCPUsFromOne;
    bool detailedCPUTime;
    bool showCPUUsage;
    bool showCPUFrequency;
@@ -56,7 +56,7 @@ typedef struct Settings_ {
    bool changed;
 } Settings;
 
-#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromZero ? (cpu) : (cpu)+1)
+#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromOne ? (cpu)+1 : (cpu))
 
 void Settings_delete(Settings* this);
 
-- 
cgit v1.2.3