svn commit: r190489 - head/lib/libc/db/hash

[Xin LI]

Author: delphij
Date: Sat Mar 28 06:23:10 2009
New Revision: 190489
URL: http://svn.freebsd.org/changeset/base/190489

Log:
  Diff reduce against OpenBSD, no functional change.

Modified:
  head/lib/libc/db/hash/hash.c
  head/lib/libc/db/hash/hash_page.c

Modified: head/lib/libc/db/hash/hash.c
==============================================================================
--- head/lib/libc/db/hash/hash.c        Sat Mar 28 06:22:11 2009        
(r190488)
+++ head/lib/libc/db/hash/hash.c        Sat Mar 28 06:23:10 2009        
(r190489)
@@ -347,8 +347,7 @@ init_hash(HTAB *hashp, const char *file,
 static int
 init_htab(HTAB *hashp, int nelem)
 {
-       int nbuckets, nsegs;
-       int l2;
+       int nbuckets, nsegs, l2;
 
        /*
         * Divide number of elements by the fill factor and determine a

Modified: head/lib/libc/db/hash/hash_page.c
==============================================================================
--- head/lib/libc/db/hash/hash_page.c   Sat Mar 28 06:22:11 2009        
(r190488)
+++ head/lib/libc/db/hash/hash_page.c   Sat Mar 28 06:23:10 2009        
(r190489)
@@ -124,9 +124,8 @@ putpair(char *p, const DBT *key, const D
 int
 __delpair(HTAB *hashp, BUFHEAD *bufp, int ndx)
 {
-       u_int16_t *bp, newoff;
+       u_int16_t *bp, newoff, pairlen;
        int n;
-       u_int16_t pairlen;
 
        bp = (u_int16_t *)bufp->page;
        n = bp[0];
@@ -453,8 +452,7 @@ __addel(HTAB *hashp, BUFHEAD *bufp, cons
 BUFHEAD *
 __add_ovflpage(HTAB *hashp, BUFHEAD *bufp)
 {
-       u_int16_t *sp;
-       u_int16_t ndx, ovfl_num;
+       u_int16_t *sp, ndx, ovfl_num;
 #ifdef DEBUG1
        int tmp1, tmp2;
 #endif
@@ -505,8 +503,7 @@ int
 __get_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int is_disk,
     int is_bitmap)
 {
-       int fd, page, size;
-       int rsize;
+       int fd, page, size, rsize;
        u_int16_t *bp;
 
        fd = hashp->fp;
@@ -560,8 +557,7 @@ __get_page(HTAB *hashp, char *p, u_int32
 int
 __put_page(HTAB *hashp, char *p, u_int32_t bucket, int is_bucket, int 
is_bitmap)
 {
-       int fd, page, size;
-       int wsize;
+       int fd, page, size, wsize;
 
        size = hashp->BSIZE;
        if ((hashp->fp == -1) && open_temp(hashp))
@@ -569,8 +565,7 @@ __put_page(HTAB *hashp, char *p, u_int32
        fd = hashp->fp;
 
        if (hashp->LORDER != BYTE_ORDER) {
-               int i;
-               int max;
+               int i, max;
 
                if (is_bitmap) {
                        max = hashp->BSIZE >> 2;        /* divide by 4 */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"