From cvs-return-1231-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sun May 13 17:29:51 2001 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 80710 invoked by uid 500); 13 May 2001 17:29:47 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 80241 invoked by uid 500); 13 May 2001 17:29:44 -0000 Delivered-To: apmail-apr-util-cvs@apache.org Date: 13 May 2001 17:29:43 -0000 Message-ID: <20010513172943.80205.qmail@apache.org> From: wrowe@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util/dbm/sdbm sdbm.c wrowe 01/05/13 10:29:43 Modified: dbm/sdbm sdbm.c Log: Dropped a significant little bit of code and had the wrong sequencing in apr_sdbm_firstkey() ... seems a rememnant of the old code. Thanks to Greg Stein for noting this descrepancy. Revision Changes Path 1.22 +8 -2 apr-util/dbm/sdbm/sdbm.c Index: sdbm.c =================================================================== RCS file: /home/cvs/apr-util/dbm/sdbm/sdbm.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sdbm.c 2001/05/09 19:12:38 1.21 +++ sdbm.c 2001/05/13 17:29:41 1.22 @@ -464,11 +464,17 @@ /* * start at page 0 */ - status = read_from(db->pagf, db->pagbuf, OFF_PAG(0), PBLKSIZ); + if ((status = read_from(db->pagf, db->pagbuf, OFF_PAG(0), PBLKSIZ)) + == APR_SUCCESS) { + db->pagbno = 0; + db->blkptr = 0; + db->keyptr = 0; + status = getnext(key, db); + } (void) apr_sdbm_unlock(db); - return getnext(key, db); + return status; } APU_DECLARE(apr_status_t) apr_sdbm_nextkey(apr_sdbm_t *db,