From 90ea3ac3c9104d1519e067aeeefc07c7f75313ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Wed, 23 Dec 2020 13:02:32 +0100
Subject: Object: return int on comparison

Comparisons do, due to the new introduced shaceship-comparisons,
only return -1, 0, 1 or the result of strcmp().
---
 ListItem.c                         | 2 +-
 Object.h                           | 2 +-
 Process.c                          | 8 ++++----
 Process.h                          | 8 ++++----
 ProcessList.c                      | 4 ++--
 darwin/DarwinProcess.c             | 2 +-
 dragonflybsd/DragonFlyBSDProcess.c | 2 +-
 freebsd/FreeBSDProcess.c           | 2 +-
 linux/LinuxProcess.c               | 2 +-
 openbsd/OpenBSDProcess.c           | 2 +-
 solaris/SolarisProcess.c           | 2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ListItem.c b/ListItem.c
index 8d962aef..7ccf8d7a 100644
--- a/ListItem.c
+++ b/ListItem.c
@@ -57,7 +57,7 @@ void ListItem_append(ListItem* this, const char* text) {
    this->value[newLen] = '\0';
 }
 
-static long ListItem_compare(const void* cast1, const void* cast2) {
+static int ListItem_compare(const void* cast1, const void* cast2) {
    const ListItem* obj1 = (const ListItem*) cast1;
    const ListItem* obj2 = (const ListItem*) cast2;
    return strcmp(obj1->value, obj2->value);
diff --git a/Object.h b/Object.h
index 2c3ba9f9..89933fa6 100644
--- a/Object.h
+++ b/Object.h
@@ -24,7 +24,7 @@ struct Object_;
 typedef struct Object_ Object;
 
 typedef void(*Object_Display)(const Object*, RichString*);
-typedef long(*Object_Compare)(const void*, const void*);
+typedef int(*Object_Compare)(const void*, const void*);
 typedef void(*Object_Delete)(Object*);
 
 #define Object_getClass(obj_)         ((const Object*)(obj_))->klass
diff --git a/Process.c b/Process.c
index 8dfd504c..2b8dde81 100644
--- a/Process.c
+++ b/Process.c
@@ -476,14 +476,14 @@ bool Process_sendSignal(Process* this, Arg sgn) {
    return ok;
 }
 
-long Process_pidCompare(const void* v1, const void* v2) {
+int Process_pidCompare(const void* v1, const void* v2) {
    const Process* p1 = (const Process*)v1;
    const Process* p2 = (const Process*)v2;
 
    return SPACESHIP_NUMBER(p1->pid, p2->pid);
 }
 
-long Process_compare(const void* v1, const void* v2) {
+int Process_compare(const void* v1, const void* v2) {
    const Process *p1, *p2;
    const Settings *settings = ((const Process*)v1)->settings;
 
@@ -497,7 +497,7 @@ long Process_compare(const void* v1, const void* v2) {
 
    ProcessField key = Settings_getActiveSortKey(settings);
 
-   long result = Process_compareByKey(p1, p2, key);
+   int result = Process_compareByKey(p1, p2, key);
 
    // Implement tie-breaker (needed to make tree mode more stable)
    if (!result)
@@ -506,7 +506,7 @@ long Process_compare(const void* v1, const void* v2) {
    return result;
 }
 
-long Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key) {
+int Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key) {
    int r;
 
    switch (key) {
diff --git a/Process.h b/Process.h
index 91d39409..899aa9cf 100644
--- a/Process.h
+++ b/Process.h
@@ -122,7 +122,7 @@ typedef struct ProcessFieldData_ {
 
 // Implemented in platform-specific code:
 void Process_writeField(const Process* this, RichString* str, ProcessField field);
-long Process_compare(const void* v1, const void* v2);
+int Process_compare(const void* v1, const void* v2);
 void Process_delete(Object* cast);
 bool Process_isThread(const Process* this);
 extern const ProcessFieldData Process_fields[LAST_PROCESSFIELD];
@@ -131,7 +131,7 @@ extern int Process_pidDigits;
 
 typedef Process*(*Process_New)(const struct Settings_*);
 typedef void (*Process_WriteField)(const Process*, RichString*, ProcessField);
-typedef long (*Process_CompareByKey)(const Process*, const Process*, ProcessField);
+typedef int (*Process_CompareByKey)(const Process*, const Process*, ProcessField);
 typedef const char* (*Process_GetCommandStr)(const Process*);
 
 typedef struct ProcessClass_ {
@@ -199,8 +199,8 @@ bool Process_changePriorityBy(Process* this, Arg delta);
 
 bool Process_sendSignal(Process* this, Arg sgn);
 
-long Process_pidCompare(const void* v1, const void* v2);
+int Process_pidCompare(const void* v1, const void* v2);
 
-long Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key);
+int Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key);
 
 #endif
diff --git a/ProcessList.c b/ProcessList.c
index d0bd89fe..9709f3c1 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -348,14 +348,14 @@ static void ProcessList_buildTreeBranch(ProcessList* this, pid_t pid, int level,
    Vector_delete(children);
 }
 
-static long ProcessList_treeProcessCompare(const void* v1, const void* v2) {
+static int ProcessList_treeProcessCompare(const void* v1, const void* v2) {
    const Process *p1 = (const Process*)v1;
    const Process *p2 = (const Process*)v2;
 
    return SPACESHIP_NUMBER(p1->tree_left, p2->tree_left);
 }
 
-static long ProcessList_treeProcessCompareByPID(const void* v1, const void* v2) {
+static int ProcessList_treeProcessCompareByPID(const void* v1, const void* v2) {
    const Process *p1 = (const Process*)v1;
    const Process *p2 = (const Process*)v2;
 
diff --git a/darwin/DarwinProcess.c b/darwin/DarwinProcess.c
index e28e9b50..bedfefe5 100644
--- a/darwin/DarwinProcess.c
+++ b/darwin/DarwinProcess.c
@@ -82,7 +82,7 @@ static void DarwinProcess_writeField(const Process* this, RichString* str, Proce
    RichString_appendWide(str, attr, buffer);
 }
 
-static long DarwinProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+static int DarwinProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
    const DarwinProcess* p1 = (const DarwinProcess*)v1;
    const DarwinProcess* p2 = (const DarwinProcess*)v2;
 
diff --git a/dragonflybsd/DragonFlyBSDProcess.c b/dragonflybsd/DragonFlyBSDProcess.c
index 35594c78..feffe666 100644
--- a/dragonflybsd/DragonFlyBSDProcess.c
+++ b/dragonflybsd/DragonFlyBSDProcess.c
@@ -86,7 +86,7 @@ static void DragonFlyBSDProcess_writeField(const Process* this, RichString* str,
    RichString_appendWide(str, attr, buffer);
 }
 
-static long DragonFlyBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+static int DragonFlyBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
    const DragonFlyBSDProcess* p1 = (const DragonFlyBSDProcess*)v1;
    const DragonFlyBSDProcess* p2 = (const DragonFlyBSDProcess*)v2;
 
diff --git a/freebsd/FreeBSDProcess.c b/freebsd/FreeBSDProcess.c
index 01edb8eb..f5ed5d5e 100644
--- a/freebsd/FreeBSDProcess.c
+++ b/freebsd/FreeBSDProcess.c
@@ -96,7 +96,7 @@ static void FreeBSDProcess_writeField(const Process* this, RichString* str, Proc
    RichString_appendWide(str, attr, buffer);
 }
 
-static long FreeBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+static int FreeBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
    const FreeBSDProcess* p1 = (const FreeBSDProcess*)v1;
    const FreeBSDProcess* p2 = (const FreeBSDProcess*)v2;
 
diff --git a/linux/LinuxProcess.c b/linux/LinuxProcess.c
index 3ee9d2c6..a45505e2 100644
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@@ -748,7 +748,7 @@ static void LinuxProcess_writeField(const Process* this, RichString* str, Proces
    RichString_appendWide(str, attr, buffer);
 }
 
-static long LinuxProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+static int LinuxProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
    const LinuxProcess* p1 = (const LinuxProcess*)v1;
    const LinuxProcess* p2 = (const LinuxProcess*)v2;
 
diff --git a/openbsd/OpenBSDProcess.c b/openbsd/OpenBSDProcess.c
index 642e9bea..00aea637 100644
--- a/openbsd/OpenBSDProcess.c
+++ b/openbsd/OpenBSDProcess.c
@@ -202,7 +202,7 @@ static void OpenBSDProcess_writeField(const Process* this, RichString* str, Proc
    RichString_appendWide(str, attr, buffer);
 }
 
-static long OpenBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+static int OpenBSDProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
    const OpenBSDProcess* p1 = (const OpenBSDProcess*)v1;
    const OpenBSDProcess* p2 = (const OpenBSDProcess*)v2;
 
diff --git a/solaris/SolarisProcess.c b/solaris/SolarisProcess.c
index e691494e..d26ba099 100644
--- a/solaris/SolarisProcess.c
+++ b/solaris/SolarisProcess.c
@@ -101,7 +101,7 @@ void SolarisProcess_writeField(const Process* this, RichString* str, ProcessFiel
    RichString_appendWide(str, attr, buffer);
 }
 
-long SolarisProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
+int SolarisProcess_compareByKey(const Process* v1, const Process* v2, ProcessField key) {
    const SolarisProcess* p1 = (const SolarisProcess*)v1;
    const SolarisProcess* p2 = (const SolarisProcess*)v2;
 
-- 
cgit v1.2.3