diff options
Diffstat (limited to 'bdb/log')
| -rw-r--r-- | bdb/log/log.c | 14 | ||||
| -rw-r--r-- | bdb/log/log_rec.c | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/bdb/log/log.c b/bdb/log/log.c index 69af1624824..8ddb7bcaf7d 100644 --- a/bdb/log/log.c +++ b/bdb/log/log.c @@ -309,13 +309,13 @@ __log_find(dblp, find_first, valp, statusp) int find_first, *valp; logfile_validity *statusp; { - logfile_validity clv_status, status; + logfile_validity logval_status, status; u_int32_t clv, logval; int cnt, fcnt, ret; const char *dir; char **names, *p, *q, savech; - clv_status = status = DB_LV_NORMAL; + logval_status = status = DB_LV_NONEXISTENT; /* Return a value of 0 as the log file number on failure. */ *valp = 0; @@ -385,10 +385,14 @@ __log_find(dblp, find_first, valp, statusp) * as a valid log file. */ break; + case DB_LV_NONEXISTENT: + /* Should never happen. */ + DB_ASSERT(0); + break; case DB_LV_NORMAL: case DB_LV_OLD_READABLE: logval = clv; - clv_status = status; + logval_status = status; break; case DB_LV_OLD_UNREADABLE: /* @@ -410,7 +414,7 @@ __log_find(dblp, find_first, valp, statusp) */ if (!find_first) { logval = clv; - clv_status = status; + logval_status = status; } break; } @@ -420,7 +424,7 @@ __log_find(dblp, find_first, valp, statusp) err: __os_dirfree(names, fcnt); __os_freestr(p); - *statusp = clv_status; + *statusp = logval_status; return (ret); } diff --git a/bdb/log/log_rec.c b/bdb/log/log_rec.c index ad6d9f7ead2..493dd06d4c6 100644 --- a/bdb/log/log_rec.c +++ b/bdb/log/log_rec.c @@ -430,7 +430,7 @@ __log_add_logid(dbenv, logp, dbp, ndx) TAILQ_INIT(&logp->dbentry[i].dblist); else TAILQ_REINSERT_HEAD( - &logp->dbentry[i].dblist, dbp, links); + &logp->dbentry[i].dblist, dbtmp, links); } /* Initialize the new entries. */ |