cvs: php-src(PHP_5_2) /ext/dba/libcdb cdb.c
| From: | Marcus Boerger | Date: | Fri, 03 Nov 2006 19:00:46 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/dba/libcdb cdb.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41329@lists.php.net to get a copy of this message | ||
helly Fri Nov 3 19:00:46 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/dba/libcdb cdb.c
Log:
- MFH: Fixed bug #38698
http://cvs.php.net/viewvc.cgi/php-src/ext/dba/libcdb/cdb.c?r1=1.10.2.1&r2=1.10.2.1.2.1&diff_format=u
Index: php-src/ext/dba/libcdb/cdb.c
diff -u php-src/ext/dba/libcdb/cdb.c:1.10.2.1 php-src/ext/dba/libcdb/cdb.c:1.10.2.1.2.1
--- php-src/ext/dba/libcdb/cdb.c:1.10.2.1 Sun Jan 1 12:50:05 2006
+++ php-src/ext/dba/libcdb/cdb.c Fri Nov 3 19:00:46 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cdb.c,v 1.10.2.1 2006/01/01 12:50:05 sniper Exp $ */
+/* $Id: cdb.c,v 1.10.2.1.2.1 2006/11/03 19:00:46 helly Exp $ */
/* incorporated from D.J.Bernstein's cdb-0.75 (http://cr.yp.to/cdb.html)*/
@@ -68,10 +68,11 @@
uint32 cdb_hash(char *buf, unsigned int len)
{
uint32 h;
+ const unsigned char * b = buf;
h = CDB_HASHSTART;
while (len--) {
- h = ( h + (h << 5)) ^ (*buf++);
+ h = ( h + (h << 5)) ^ (*b++);
}
return h;
}
@@ -188,6 +189,6 @@
/* {{{ cdb_version */
char *cdb_version()
{
- return "0.75, $Revision: 1.10.2.1 $";
+ return "0.75, $Revision: 1.10.2.1.2.1 $";
}
/* }}} */