X-Git-Url: http://dolda2000.com/gitweb/?p=vcfs.git;a=blobdiff_plain;f=store.c;h=4d6497c754f07cffdbe051a7b7f41c9a2a5bb8a0;hp=87275123f98283c32a8b805c0501209ffc6990d1;hb=c03b50c481d8e9bbdc9a7acd36deac550377a9f4;hpb=d5cf535197d5090554453b6357867d782f0d1484

diff --git a/store.c b/store.c
index 8727512..4d6497c 100644
--- a/store.c
+++ b/store.c
@@ -22,7 +22,7 @@ static ssize_t cacheget(struct store *st, struct addr *a, void *buf, size_t len)
 {
     int he, i;
 
-    he = a->hash[0] + ((a->hash[1] & 0x0f) << 8);
+    he = a->hash[0] | ((a->hash[1] & 0x0f) << 8);
     for(i = 0; i < 4; i++) {
 	if(!addrcmp(&st->cache[he * 4 + i].a, a))
 	    break;
@@ -39,7 +39,7 @@ static void cacheput(struct store *st, struct addr *a, const void *data, ssize_t
     int he, i;
     struct storecache tmp;
     
-    he = a->hash[0] + ((a->hash[1] & 0x0f) << 8);
+    he = a->hash[0] | ((a->hash[1] & 0x0f) << 8);
     for(i = 0; i < 4; i++) {
 	if(!addrcmp(&st->cache[he * 4 + i].a, a))
 	    break;
@@ -48,13 +48,13 @@ static void cacheput(struct store *st, struct addr *a, const void *data, ssize_t
 	return;
     if(i < 4) {
 	tmp = st->cache[he * 4 + i];
-	memmove(&st->cache[he * 4 + 1], &st->cache[he * 4], i);
+	memmove(&st->cache[he * 4 + 1], &st->cache[he * 4], i * sizeof(struct storecache));
 	st->cache[he * 4] = tmp;
 	return;
     }
     if(st->cache[he * 4 + 3].data != NULL)
 	free(st->cache[he * 4 + 3].data);
-    memmove(&st->cache[he * 4 + 1], &st->cache[he * 4], 3);
+    memmove(&st->cache[he * 4 + 1], &st->cache[he * 4], 3 * sizeof(struct storecache));
     st->cache[he * 4].a = *a;
     if(len > 0)
 	st->cache[he * 4].data = memcpy(malloc(len), data, len);
@@ -79,18 +79,20 @@ int storeput(struct store *st, const void *buf, size_t len, struct addr *at)
 ssize_t storeget(struct store *st, void *buf, size_t len, struct addr *at)
 {
     ssize_t sz;
+    struct addr at2;
     
-    sz = cacheget(st, at, buf, len);
+    at2 = *at;
+    sz = cacheget(st, &at2, buf, len);
     if(sz != -2) {
 	if(sz == -1)
 	    errno = ENOENT;
 	return(sz);
     }
-    sz = st->ops->get(st, buf, len, at);
+    sz = st->ops->get(st, buf, len, &at2);
     if((sz < 0) && (errno == ENOENT))
-	cacheput(st, at, NULL, -1);
+	cacheput(st, &at2, NULL, -1);
     else if(sz >= 0)
-	cacheput(st, at, buf, sz);
+	cacheput(st, &at2, buf, sz);
     return(sz);
 }