Re: [ 5/9 ] [ SEMANAGE ] Change database to singly-linked list

[Ivan Gyurdiev <ivg2@cornell.edu>]

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

This patch changes the previously doubly-linked list in database.c to a 
singly-linked list, which is sufficient.

[-- Attachment #2: libsemanage.04.dbase_single_link.diff --]
[-- Type: text/x-patch, Size: 1580 bytes --]

diff -Naur libsemanage/src/database.c libsemanage.new2/src/database.c
--- libsemanage/src/database.c	2005-09-29 17:54:40.000000000 -0400
+++ libsemanage.new2/src/database.c	2005-09-29 18:03:08.000000000 -0400
@@ -12,7 +12,6 @@
 /* Representation of the database once loaded in memory */
 typedef struct cache_entry {
 	record_t data;
-	struct cache_entry* prev;
 	struct cache_entry* next;
 } cache_entry_t;
 
@@ -98,10 +97,7 @@
 	if (entry == NULL)
 		goto omem;
 	entry->data = data;
-	entry->prev = NULL;
 	entry->next = dbase->cache;
-	if (dbase->cache != NULL)
-		dbase->cache->prev = entry;
 	dbase->cache = entry;
 	dbase->cache_sz++;
 
@@ -267,29 +263,26 @@
 	dbase_t* dbase,
 	record_key_t key) {
 
-	cache_entry_t* entry;
-	int status;
+	cache_entry_t *ptr, *prev = NULL;
 
 	if (dbase_cache_fill(dbase) < 0)
 		goto err;
 
-	status = dbase_cache_locate(dbase, key, &entry);
-	if (status < 0)
-		goto err;
-	
-	else if (status != STATUS_NODATA) {
-		if (entry->next != NULL)
-			entry->next->prev = entry->prev;
-
-		if (entry->prev != NULL)
-			entry->prev->next = entry->next;
+	for (ptr = dbase->cache; ptr != NULL; ptr = ptr->next) {
+		if (! dbase->rtable->compare(ptr->data, key)) {
+			if (prev != NULL)
+				prev->next = ptr->next;
+			else
+				dbase->cache = ptr->next;
+
+			dbase->rtable->free(ptr->data);
+			dbase->cache_sz--;
+			free(ptr);
+			return STATUS_SUCCESS;
+		}
 		else
-			dbase->cache = entry->next;
-
-		dbase->rtable->free(entry->data);
-		dbase->cache_sz--;
-		free(entry);
-	}
+			prev = ptr;
+        }
 
 	return STATUS_SUCCESS;
 	err: