make it faster

helly25 · helly25 · commit cdcb86a4daaa · 2003-02-26T22:03:55.000Z
diff --git a/ext/dba/libcdb/cdb.c b/ext/dba/libcdb/cdb.c
@@ -64,23 +64,14 @@ static int cdb_match(struct cdb *c, char *key, unsigned int len, uint32 pos TSRM
 }
 /* }}} */
 
-/* {{{ cdb_hashadd */
-static uint32 cdb_hashadd(uint32 h, unsigned char c)
-{
-	h += (h << 5);
-	return h ^ c;
-}
-/* }}} */
-
 /* {{{ cdb_hash */
 uint32 cdb_hash(char *buf, unsigned int len)
 {
 	uint32 h;
 
 	h = CDB_HASHSTART;
-	while (len) {
-		h = cdb_hashadd(h, *buf++);
-		--len;
+	while (len--) {
+		h = ( h + (h << 5)) ^ (*buf++);
 	}
 	return h;
 }

Original file line number	Diff line number	Diff line change
`@@ -64,23 +64,14 @@ static int cdb_match(struct cdb c, char key, unsigned int len, uint32 pos TSRM`
`64`	`64`	`}`
`65`	`65`	`/* }}} */`
`66`	`66`
`67`		`-/* {{{ cdb_hashadd */`
`68`		`-static uint32 cdb_hashadd(uint32 h, unsigned char c)`
`69`		`-{`
`70`		`- h += (h << 5);`
`71`		`- return h ^ c;`
`72`		`-}`
`73`		`-/* }}} */`
`74`		`-`
`75`	`67`	`/* {{{ cdb_hash */`
`76`	`68`	`uint32 cdb_hash(char *buf, unsigned int len)`
`77`	`69`	`{`
`78`	`70`	`uint32 h;`
`79`	`71`
`80`	`72`	`h = CDB_HASHSTART;`
`81`		`- while (len) {`
`82`		`- h = cdb_hashadd(h, *buf++);`
`83`		`- --len;`
	`73`	`+ while (len--) {`
	`74`	`+ h = ( h + (h << 5)) ^ (*buf++);`
`84`	`75`	`}`
`85`	`76`	`return h;`
`86`	`77`	`}`