You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
125 lines
2.6 KiB
125 lines
2.6 KiB
*** include/log.h.orig 2001/01/25 18:22:51 11.20 |
|
--- include/log.h 2001/02/06 05:02:28 11.21 |
|
*************** |
|
*** 198,203 **** |
|
--- 198,204 ---- |
|
*/ |
|
typedef enum { |
|
DB_LV_INCOMPLETE, |
|
+ DB_LV_NONEXISTENT, |
|
DB_LV_NORMAL, |
|
DB_LV_OLD_READABLE, |
|
DB_LV_OLD_UNREADABLE |
|
*** log/log.c.orig 2001/01/25 18:22:55 11.43 |
|
--- log/log.c 2001/02/06 05:02:28 11.44 |
|
*************** |
|
*** 309,321 **** |
|
int find_first, *valp; |
|
logfile_validity *statusp; |
|
{ |
|
! logfile_validity clv_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; |
|
|
|
/* Return a value of 0 as the log file number on failure. */ |
|
*valp = 0; |
|
--- 309,321 ---- |
|
int find_first, *valp; |
|
logfile_validity *statusp; |
|
{ |
|
! logfile_validity logval_status, status; |
|
u_int32_t clv, logval; |
|
int cnt, fcnt, ret; |
|
const char *dir; |
|
char **names, *p, *q, savech; |
|
|
|
! logval_status = status = DB_LV_NONEXISTENT; |
|
|
|
/* Return a value of 0 as the log file number on failure. */ |
|
*valp = 0; |
|
*************** |
|
*** 385,394 **** |
|
* as a valid log file. |
|
*/ |
|
break; |
|
case DB_LV_NORMAL: |
|
case DB_LV_OLD_READABLE: |
|
logval = clv; |
|
! clv_status = status; |
|
break; |
|
case DB_LV_OLD_UNREADABLE: |
|
/* |
|
--- 385,398 ---- |
|
* 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; |
|
! logval_status = status; |
|
break; |
|
case DB_LV_OLD_UNREADABLE: |
|
/* |
|
*************** |
|
*** 410,416 **** |
|
*/ |
|
if (!find_first) { |
|
logval = clv; |
|
! clv_status = status; |
|
} |
|
break; |
|
} |
|
--- 414,420 ---- |
|
*/ |
|
if (!find_first) { |
|
logval = clv; |
|
! logval_status = status; |
|
} |
|
break; |
|
} |
|
*************** |
|
*** 420,426 **** |
|
|
|
err: __os_dirfree(names, fcnt); |
|
__os_freestr(p); |
|
! *statusp = clv_status; |
|
|
|
return (ret); |
|
} |
|
--- 424,430 ---- |
|
|
|
err: __os_dirfree(names, fcnt); |
|
__os_freestr(p); |
|
! *statusp = logval_status; |
|
|
|
return (ret); |
|
} |
|
*** log/log_rec.c.orig 2001/01/25 18:22:56 11.49 |
|
--- log/log_rec.c 2001/02/07 22:17:46 |
|
*************** |
|
*** 404,410 **** |
|
TAILQ_INIT(&logp->dbentry[i].dblist); |
|
else |
|
TAILQ_REINSERT_HEAD( |
|
! &logp->dbentry[i].dblist, dbp, links); |
|
} |
|
|
|
/* Initialize the new entries. */ |
|
--- 404,410 ---- |
|
TAILQ_INIT(&logp->dbentry[i].dblist); |
|
else |
|
TAILQ_REINSERT_HEAD( |
|
! &logp->dbentry[i].dblist, dbtmp, links); |
|
} |
|
|
|
/* Initialize the new entries. */ |
|
|
|
|
|
|