← cproj

hash function printf-move to main;h_search add

f0c3fb2c078847d01e2a073771f352a079ee1677 · ovidiucs · Jun 23, 2019 22:46

+67 −7 · 2 files changed

• mylib/src/myhash.c +32 −4
• mylib/test/t_hash.c +35 −3

diff --git a/mylib/src/myhash.c b/mylib/src/myhash.c
index 4b73be4..3aebddf 100644
--- a/mylib/src/myhash.c
+++ b/mylib/src/myhash.c
@@ -64,14 +64,26 @@ HashTable *h_create ( unsigned int size ) {
 	// return hash
 	return hash;
 }
-
+// Find a key in a given linked list
+static HashNode *h_findKey(HashNode *hNode, char *key) {
+	while (hNode != NULL) {
+		if(strcmp(hNode->h_key,key) == 0) {
+			break;
+		}
+	}
+	return hNode;
+}
+ 
 // Insert a key-value pair into a hash table
 
 HashNode *h_insert (HashTable *hTable, char *key, char *value) {
 	HashNode *newNode;
 
 	size_t resultHash = hash(key,hTable->h_size);
-
+	newNode = hTable->h_items[resultHash];
+	newNode = h_findKey(newNode, key);
+	
+    if ( newNode == NULL ) {	
 	if ( (newNode = (HashNode *) malloc(sizeof(HashNode) ) ) == NULL ||
 			 (newNode->h_key = strdup(key) ) == NULL ||
 			 (newNode->h_value = strdup(value) ) == NULL ) {
@@ -79,9 +91,14 @@ HashNode *h_insert (HashTable *hTable, char *key, char *value) {
 		perror("malloc () failed for HashNode");
 		exit(1);
 	}
-
 	newNode->h_next = hTable->h_items[resultHash];
 	hTable->h_items[resultHash] = newNode;
+     } else {
+ 		// Key exists , reeuse key + 1 for '/0'
+     			newNode->h_value = (char *) realloc((void *) newNode->h_value, strlen(value)+1);
+     }
+			
+
 
 	return newNode;
 }
@@ -93,12 +110,22 @@ HashNode *h_insert (HashTable *hTable, char *key, char *value) {
 // ret - HastNodes pointer
  */
 HashNode *h_search (HashTable *hTable, char *key) {
+	HashNode *newNode;
+
 	//1. call hash function with key and table size
 	size_t resultHash = hash(key,hTable->h_size);
+	newNode = hTable->h_items[resultHash];
+	newNode = h_findKey(newNode, key);
+
+	return newNode;
+}
+#if 0
 	// 1a. arguments for strcmp
 	char *keyStrAtIndex = hTable->h_items[resultHash]->h_key;
+	
 	// 1b. nextvalue local variable
 	HashNode *nextValue = hTable->h_items[resultHash]->h_next;
+	
 	// 2. set return value to a friendly variable
 	HashNode *returnVar = hTable->h_items[resultHash];
 
@@ -126,7 +153,7 @@ HashNode *h_search (HashTable *hTable, char *key) {
 					hTable->h_items[resultHash]->h_key,
 					hTable->h_items[resultHash]->h_value,
 					hTable->h_items[resultHash]->h_value
-					);
+				);
 		if ( (nextValue == NULL) && (strcmp(keyStrAtIndex,key) == 0) )
 					fprintf(stderr, "They are the same\n");
 		else {
@@ -144,3 +171,4 @@ HashNode *h_search (HashTable *hTable, char *key) {
 }
 
 //static HashTable *h_delete()
+#endif
diff --git a/mylib/test/t_hash.c b/mylib/test/t_hash.c
index 70ef1ef..f546947 100644
--- a/mylib/test/t_hash.c
+++ b/mylib/test/t_hash.c
@@ -1,17 +1,49 @@
+#include <stddef.h>
+#include <assert.h>
 #include "../include/myhash.h"
+
 // edit library implement search func.
 // test h_search - call on same keys and verify that is same result as the initial call to insert
 
+static void dumpTable (HashTable *table) {
+	HashNode **hNodePtr = table->h_items;
+	HashNode **hNodePtrZ = hNodePtr+table->h_size;
+	HashNode *node;	
+	do {
+		node = *hNodePtr;
+			while (node != NULL) {
+
+	fprintf(stderr, "De-referencing the pointer at %p we have our nosde strcutre that holds:\n\
+			h_next:  Address: %p\n\
+			h_key:   Address: %p, Value: %s\n\
+			h_value: Address: %p, Value: %s\n", hTable->h_items[resultHash],
+			hTable->h_items[resultHash]->h_next,
+			hTable->h_items[resultHash]->h_next,
+			hTable->h_items[resultHash]->h_key,
+			hTable->h_items[resultHash]->h_key,
+			hTable->h_items[resultHash]->h_value,
+			hTable->h_items[resultHash]->h_value
+			);
+			node = node->h_next;
+		}
+	} while (++hNodePtr < hNodePtrZ); 
+}
+
 // insert multpile keys
 //
 int main(){
 	HashTable *tableResult = h_create(10);
-//
+	assert(tableResult != NULL);
+	
 	HashNode  *nodeResult = h_insert(tableResult, "400", "101");
-//	HashNode  *nodeResult = h_insert(tableResult, "400", "101");
-	HashNode  *nolt = h_insert(tableResult, "400", "101");
+	assert(nodeResult != NULL);
+	
+	HashNode  *nodeResult2 = h_insert(tableResult, "401", "102");
+	
+	HashNode  *nodeResult3 = h_insert(tableResult, "400", "103");
 
 	HashNode *searchResult = h_search(tableResult,"400");
+	
 #if 0
 	int i = 0;