From 8fe04b7494fe0b8062e9afe4cf784db7f33bd5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Mon, 4 Jan 2021 23:20:36 +0100
Subject: Hashtable: use more distinct typename for key type

---
 Action.c                 |  2 +-
 Hashtable.c              |  8 ++++----
 Hashtable.h              | 12 ++++++------
 linux/LinuxProcessList.c |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Action.c b/Action.c
index 81e9121d..88ccf6df 100644
--- a/Action.c
+++ b/Action.c
@@ -104,7 +104,7 @@ static bool changePriority(MainPanel* panel, int delta) {
    return anyTagged;
 }
 
-static void addUserToVector(hkey_t key, void* userCast, void* panelCast) {
+static void addUserToVector(ht_key_t key, void* userCast, void* panelCast) {
    const char* user = userCast;
    Panel* panel = panelCast;
    Panel_add(panel, (Object*) ListItem_new(user, key));
diff --git a/Hashtable.c b/Hashtable.c
index 1beb2bb2..4f08c162 100644
--- a/Hashtable.c
+++ b/Hashtable.c
@@ -124,7 +124,7 @@ void Hashtable_clear(Hashtable* this) {
    assert(Hashtable_isConsistent(this));
 }
 
-static void insert(Hashtable* this, hkey_t key, void* value) {
+static void insert(Hashtable* this, ht_key_t key, void* value) {
    unsigned int index = key % this->size;
    unsigned int probe = 0;
 #ifndef NDEBUG
@@ -194,7 +194,7 @@ void Hashtable_setSize(Hashtable* this, unsigned int size) {
    assert(Hashtable_isConsistent(this));
 }
 
-void Hashtable_put(Hashtable* this, hkey_t key, void* value) {
+void Hashtable_put(Hashtable* this, ht_key_t key, void* value) {
 
    assert(Hashtable_isConsistent(this));
    assert(this->size > 0);
@@ -211,7 +211,7 @@ void Hashtable_put(Hashtable* this, hkey_t key, void* value) {
    assert(this->size > this->items);
 }
 
-void* Hashtable_remove(Hashtable* this, hkey_t key) {
+void* Hashtable_remove(Hashtable* this, ht_key_t key) {
    unsigned int index = key % this->size;
    unsigned int probe = 0;
 #ifndef NDEBUG
@@ -266,7 +266,7 @@ void* Hashtable_remove(Hashtable* this, hkey_t key) {
    return res;
 }
 
-void* Hashtable_get(Hashtable* this, hkey_t key) {
+void* Hashtable_get(Hashtable* this, ht_key_t key) {
    unsigned int index = key % this->size;
    unsigned int probe = 0;
    void* res = NULL;
diff --git a/Hashtable.h b/Hashtable.h
index 6d934784..698d2cfc 100644
--- a/Hashtable.h
+++ b/Hashtable.h
@@ -10,12 +10,12 @@ in the source distribution for its full text.
 #include <stdbool.h>
 
 
-typedef unsigned int hkey_t;
+typedef unsigned int ht_key_t;
 
-typedef void(*Hashtable_PairFunction)(hkey_t key, void* value, void* userdata);
+typedef void(*Hashtable_PairFunction)(ht_key_t key, void* value, void* userdata);
 
 typedef struct HashtableItem_ {
-   hkey_t key;
+   ht_key_t key;
    unsigned int probe;
    void* value;
 } HashtableItem;
@@ -41,11 +41,11 @@ void Hashtable_clear(Hashtable* this);
 
 void Hashtable_setSize(Hashtable* this, unsigned int size);
 
-void Hashtable_put(Hashtable* this, hkey_t key, void* value);
+void Hashtable_put(Hashtable* this, ht_key_t key, void* value);
 
-void* Hashtable_remove(Hashtable* this, hkey_t key);
+void* Hashtable_remove(Hashtable* this, ht_key_t key);
 
-void* Hashtable_get(Hashtable* this, hkey_t key);
+void* Hashtable_get(Hashtable* this, ht_key_t key);
 
 void Hashtable_foreach(Hashtable* this, Hashtable_PairFunction f, void* userData);
 
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
index 77b1fc8e..434d070e 100644
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@@ -484,7 +484,7 @@ static inline uint64_t fast_strtoull_hex(char **str, int maxlen) {
    return result;
 }
 
-static void LinuxProcessList_calcLibSize_helper(ATTR_UNUSED hkey_t key, void* value, void* data) {
+static void LinuxProcessList_calcLibSize_helper(ATTR_UNUSED ht_key_t key, void* value, void* data) {
    if (!data)
       return;
 
-- 
cgit v1.2.3