Date: Fri, 28 Aug 2009 19:48:06 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r196625 - in stable/8/lib/libc: . db/hash Message-ID: <200908281948.n7SJm6PZ034604@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Fri Aug 28 19:48:06 2009 New Revision: 196625 URL: http://svn.freebsd.org/changeset/base/196625 Log: MFC r196525: Consider flag == 0 as the same of flag == R_NEXT. This change will restore a historical behavior that has been changed by revision 190491, and has seen to break exim. Approved by: re (kib) Modified: stable/8/lib/libc/ (props changed) stable/8/lib/libc/db/hash/hash.c Modified: stable/8/lib/libc/db/hash/hash.c ============================================================================== --- stable/8/lib/libc/db/hash/hash.c Fri Aug 28 19:18:20 2009 (r196624) +++ stable/8/lib/libc/db/hash/hash.c Fri Aug 28 19:48:06 2009 (r196625) @@ -711,7 +711,7 @@ hash_seq(const DB *dbp, DBT *key, DBT *d hashp->cndx = 1; hashp->cpage = NULL; } - next_bucket: +next_bucket: for (bp = NULL; !bp || !bp[0]; ) { if (!(bufp = hashp->cpage)) { for (bucket = hashp->cbucket; @@ -732,7 +732,7 @@ hash_seq(const DB *dbp, DBT *key, DBT *d } } else { bp = (u_int16_t *)hashp->cpage->page; - if (flag == R_NEXT) { + if (flag == R_NEXT || flag == 0) { hashp->cndx += 2; if (hashp->cndx > bp[0]) { hashp->cpage = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908281948.n7SJm6PZ034604>