From 4961fdf75ead42902d13e847356bf8c554d0a9c9 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Fri, 3 Feb 2023 16:21:26 -0500
Subject: Flatten cache structs

---
 cache.c   | 240 +++++++++++++++++++++++++++++---------------------------------
 chat.h    |   8 ++-
 command.c |   7 +-
 input.c   |   5 +-
 4 files changed, 124 insertions(+), 136 deletions(-)

diff --git a/cache.c b/cache.c
index 970bd9c..3bff269 100644
--- a/cache.c
+++ b/cache.c
@@ -33,194 +33,180 @@
 
 #include "chat.h"
 
-struct Node {
-	uint id;
-	char *key;
-	struct Entry entry;
-	struct Node *prev;
-	struct Node *next;
-};
-
 static const struct Entry DefaultEntry = { .color = Default };
 
+static struct Entry *entryAlloc(uint id, const char *key) {
+	struct Entry *entry = malloc(sizeof(*entry));
+	if (!entry) err(EX_OSERR, "malloc");
+	*entry = DefaultEntry;
+	entry->id = id;
+	entry->key = strdup(key);
+	if (!entry->key) err(EX_OSERR, "strdup");
+	return entry;
+}
+
+static void entryFree(struct Entry *entry) {
+	free(entry->key);
+	free(entry);
+}
+
 static uint gen;
-static struct Node *head;
-static struct Node *tail;
-
-static struct Node *alloc(uint id, const char *key) {
-	struct Node *node = calloc(1, sizeof(*node));
-	if (!node) err(EX_OSERR, "calloc");
-	node->id = id;
-	node->key = strdup(key);
-	node->entry = DefaultEntry;
-	if (!node->key) err(EX_OSERR, "strdup");
-	return node;
-}
-
-static struct Node *detach(struct Node *node) {
-	if (node->prev) node->prev->next = node->next;
-	if (node->next) node->next->prev = node->prev;
-	if (head == node) head = node->next;
-	if (tail == node) tail = node->prev;
-	node->prev = NULL;
-	node->next = NULL;
-	return node;
-}
-
-static struct Node *prepend(struct Node *node) {
-	node->prev = NULL;
-	node->next = head;
-	if (head) head->prev = node;
-	head = node;
-	tail = (tail ?: node);
-	return node;
-}
-
-static struct Node *append(struct Node *node) {
-	node->next = NULL;
-	node->prev = tail;
-	if (tail) tail->next = node;
-	tail = node;
-	head = (head ?: node);
-	return node;
-}
-
-static struct Node *find(uint id, const char *key) {
-	for (struct Node *node = head; node; node = node->next) {
-		if (node->id != id) continue;
-		if (strcmp(node->key, key)) continue;
-		return node;
+static struct Entry *head;
+static struct Entry *tail;
+
+static struct Entry *detach(struct Entry *entry) {
+	if (entry->prev) entry->prev->next = entry->next;
+	if (entry->next) entry->next->prev = entry->prev;
+	if (head == entry) head = entry->next;
+	if (tail == entry) tail = entry->prev;
+	entry->prev = NULL;
+	entry->next = NULL;
+	return entry;
+}
+
+static struct Entry *prepend(struct Entry *entry) {
+	entry->prev = NULL;
+	entry->next = head;
+	if (head) head->prev = entry;
+	head = entry;
+	tail = (tail ?: entry);
+	return entry;
+}
+
+static struct Entry *append(struct Entry *entry) {
+	entry->next = NULL;
+	entry->prev = tail;
+	if (tail) tail->next = entry;
+	tail = entry;
+	head = (head ?: entry);
+	return entry;
+}
+
+static struct Entry *find(uint id, const char *key) {
+	for (struct Entry *entry = head; entry; entry = entry->next) {
+		if (entry->id != id) continue;
+		if (strcmp(entry->key, key)) continue;
+		return entry;
 	}
 	return NULL;
 }
 
-static struct Node *insert(bool touch, uint id, const char *key) {
-	struct Node *node = find(id, key);
-	if (node && touch) {
-		return prepend(detach(node));
-	} else if (node) {
-		return node;
+static struct Entry *insert(bool touch, uint id, const char *key) {
+	struct Entry *entry = find(id, key);
+	if (entry && touch) {
+		return prepend(detach(entry));
+	} else if (entry) {
+		return entry;
 	} else if (touch) {
-		return prepend(alloc(id, key));
+		return prepend(entryAlloc(id, key));
 	} else {
-		return append(alloc(id, key));
+		return append(entryAlloc(id, key));
 	}
 }
 
 const struct Entry *cacheGet(uint id, const char *key) {
-	struct Node *node = find(id, key);
-	return (node ? &node->entry : &DefaultEntry);
+	struct Entry *entry = find(id, key);
+	return (entry ?: &DefaultEntry);
 }
 
 struct Entry *cacheInsert(bool touch, uint id, const char *key) {
-	return &insert(touch, id, key)->entry;
+	return insert(touch, id, key);
 }
 
 void cacheReplace(bool touch, const char *old, const char *new) {
-	struct Node *next = NULL;
-	for (struct Node *node = head; node; node = next) {
-		next = node->next;
-		if (strcmp(node->key, old)) continue;
-		free(node->key);
-		node->key = strdup(new);
-		if (!node->key) err(EX_OSERR, "strdup");
-		if (touch) prepend(detach(node));
+	struct Entry *next = NULL;
+	for (struct Entry *entry = head; entry; entry = next) {
+		next = entry->next;
+		if (strcmp(entry->key, old)) continue;
+		free(entry->key);
+		entry->key = strdup(new);
+		if (!entry->key) err(EX_OSERR, "strdup");
+		if (touch) prepend(detach(entry));
 	}
 }
 
 void cacheRemove(uint id, const char *key) {
 	gen++;
-	struct Node *next = NULL;
-	for (struct Node *node = head; node; node = next) {
-		next = node->next;
-		if (id && node->id != id) continue;
-		if (strcmp(node->key, key)) continue;
-		detach(node);
-		free(node->key);
-		free(node);
+	struct Entry *next = NULL;
+	for (struct Entry *entry = head; entry; entry = next) {
+		next = entry->next;
+		if (id && entry->id != id) continue;
+		if (strcmp(entry->key, key)) continue;
+		detach(entry);
+		entryFree(entry);
 		if (id) break;
 	}
 }
 
 void cacheClear(uint id) {
 	gen++;
-	struct Node *next = NULL;
-	for (struct Node *node = head; node; node = next) {
-		next = node->next;
-		if (node->id != id) continue;
-		detach(node);
-		free(node->key);
-		free(node);
+	struct Entry *next = NULL;
+	for (struct Entry *entry = head; entry; entry = next) {
+		next = entry->next;
+		if (entry->id != id) continue;
+		detach(entry);
+		entryFree(entry);
 	}
 }
 
 const char *cacheComplete(struct Cursor *curs, uint id, const char *prefix) {
 	size_t len = strlen(prefix);
-	if (curs->gen != gen) curs->node = NULL;
+	if (curs->gen != gen) curs->entry = NULL;
 	for (
-		curs->gen = gen, curs->node = (curs->node ? curs->node->next : head);
-		curs->node;
-		curs->node = curs->node->next
+		curs->gen = gen, curs->entry = (curs->entry ? curs->entry->next : head);
+		curs->entry;
+		curs->entry = curs->entry->next
 	) {
-		if (curs->node->id && curs->node->id != id) continue;
-		if (strncasecmp(curs->node->key, prefix, len)) continue;
-		curs->entry = &curs->node->entry;
-		return curs->node->key;
+		if (curs->entry->id && curs->entry->id != id) continue;
+		if (strncasecmp(curs->entry->key, prefix, len)) continue;
+		return curs->entry->key;
 	}
 	return NULL;
 }
 
 const char *cacheSearch(struct Cursor *curs, uint id, const char *substr) {
-	if (curs->gen != gen) curs->node = NULL;
+	if (curs->gen != gen) curs->entry = NULL;
 	for (
-		curs->gen = gen, curs->node = (curs->node ? curs->node->next : head);
-		curs->node;
-		curs->node = curs->node->next
+		curs->gen = gen, curs->entry = (curs->entry ? curs->entry->next : head);
+		curs->entry;
+		curs->entry = curs->entry->next
 	) {
-		if (curs->node->id && curs->node->id != id) continue;
-		if (!strstr(curs->node->key, substr)) continue;
-		curs->entry = &curs->node->entry;
-		return curs->node->key;
+		if (curs->entry->id && curs->entry->id != id) continue;
+		if (!strstr(curs->entry->key, substr)) continue;
+		return curs->entry->key;
 	}
 	return NULL;
 }
 
 const char *cacheNextKey(struct Cursor *curs, uint id) {
-	if (curs->gen != gen) curs->node = NULL;
+	if (curs->gen != gen) curs->entry = NULL;
 	for (
-		curs->gen = gen, curs->node = (curs->node ? curs->node->next : head);
-		curs->node;
-		curs->node = curs->node->next
+		curs->gen = gen, curs->entry = (curs->entry ? curs->entry->next : head);
+		curs->entry;
+		curs->entry = curs->entry->next
 	) {
-		if (curs->node->id != id) continue;
-		curs->entry = &curs->node->entry;
-		return curs->node->key;
+		if (curs->entry->id != id) continue;
+		return curs->entry->key;
 	}
 	return NULL;
 }
 
 uint cacheNextID(struct Cursor *curs, const char *key) {
-	if (curs->gen != gen) curs->node = NULL;
+	if (curs->gen != gen) curs->entry = NULL;
 	for (
-		curs->gen = gen, curs->node = (curs->node ? curs->node->next : head);
-		curs->node;
-		curs->node = curs->node->next
+		curs->gen = gen, curs->entry = (curs->entry ? curs->entry->next : head);
+		curs->entry;
+		curs->entry = curs->entry->next
 	) {
-		if (!curs->node->id) continue;
-		if (strcmp(curs->node->key, key)) continue;
-		curs->entry = &curs->node->entry;
-		return curs->node->id;
+		if (!curs->entry->id) continue;
+		if (strcmp(curs->entry->key, key)) continue;
+		return curs->entry->id;
 	}
 	return None;
 }
 
-void cacheAccept(struct Cursor *curs) {
-	if (curs->gen == gen && curs->node) {
-		prepend(detach(curs->node));
+void cacheTouch(struct Cursor *curs) {
+	if (curs->gen == gen && curs->entry) {
+		prepend(detach(curs->entry));
 	}
-	curs->node = NULL;
-}
-
-void cacheReject(struct Cursor *curs) {
-	curs->node = NULL;
 }
diff --git a/chat.h b/chat.h
index 15c757f..8086c9e 100644
--- a/chat.h
+++ b/chat.h
@@ -409,12 +409,15 @@ int bufferReflow(
 );
 
 struct Entry {
+	uint id;
+	char *key;
 	enum Color color;
 	uint prefixBits;
+	struct Entry *prev;
+	struct Entry *next;
 };
 struct Cursor {
 	uint gen;
-	struct Node *node;
 	struct Entry *entry;
 };
 const struct Entry *cacheGet(uint id, const char *key);
@@ -426,8 +429,7 @@ const char *cacheComplete(struct Cursor *curs, uint id, const char *prefix);
 const char *cacheSearch(struct Cursor *curs, uint id, const char *substr);
 uint cacheNextID(struct Cursor *curs, const char *key);
 const char *cacheNextKey(struct Cursor *curs, uint id);
-void cacheAccept(struct Cursor *curs);
-void cacheReject(struct Cursor *curs);
+void cacheTouch(struct Cursor *curs);
 
 extern struct Util urlOpenUtil;
 extern struct Util urlCopyUtil;
diff --git a/command.c b/command.c
index 4fb58da..23b5e89 100644
--- a/command.c
+++ b/command.c
@@ -419,11 +419,10 @@ static void commandWindow(uint id, char *params) {
 			windowShow(windowFor(id));
 			return;
 		}
-		struct Cursor curs = {0};
-		for (const char *match; (match = cacheSearch(&curs, None, params));) {
-			id = idFind(match);
+		for (struct Cursor curs = {0}; cacheSearch(&curs, None, params);) {
+			id = idFind(curs.entry->key);
 			if (!id) continue;
-			cacheAccept(&curs);
+			cacheTouch(&curs);
 			windowShow(windowFor(id));
 			break;
 		}
diff --git a/input.c b/input.c
index bcefee5..15f733d 100644
--- a/input.c
+++ b/input.c
@@ -300,12 +300,13 @@ static struct {
 } tab;
 
 static void tabAccept(void) {
-	cacheAccept(&tab.curs);
+	cacheTouch(&tab.curs);
+	tab.curs = (struct Cursor) {0};
 	tab.len = 0;
 }
 
 static void tabReject(void) {
-	cacheReject(&tab.curs);
+	tab.curs = (struct Cursor) {0};
 	tab.len = 0;
 }
 
-- 
cgit 1.4.1