projects / packages / db4.2.git / blame
| Commit | Line | Data |
|---|---|---|
| 36596195 AM |
1 | *** db/db_open.c.orig 2002/10/11 20:20:13 11.216 |
| 2 | --- db/db_open.c 2002/10/16 19:57:26 | |
| 3 | *************** | |
| 4 | *** 536,546 **** | |
| 5 | * and even a checksum error isn't a reason to panic the environment. | |
| 6 | */ | |
| 7 | if ((ret = __db_chk_meta(dbenv, dbp, meta, do_metachk)) != 0) { | |
| 8 | ! if (ret == -1) { | |
| 9 | __db_err(dbenv, | |
| 10 | "%s: metadata page checksum error", name); | |
| 11 | - ret = EINVAL; | |
| 12 | - } | |
| 13 | goto bad_format; | |
| 14 | } | |
| 15 | ||
| 16 | --- 536,544 ---- | |
| 17 | * and even a checksum error isn't a reason to panic the environment. | |
| 18 | */ | |
| 19 | if ((ret = __db_chk_meta(dbenv, dbp, meta, do_metachk)) != 0) { | |
| 20 | ! if (ret == -1) | |
| 21 | __db_err(dbenv, | |
| 22 | "%s: metadata page checksum error", name); | |
| 23 | goto bad_format; | |
| 24 | } | |
| 25 | ||
| 26 | *************** | |
| 27 | *** 577,583 **** | |
| 28 | ||
| 29 | bad_format: | |
| 30 | __db_err(dbenv, "%s: unexpected file type or format", name); | |
| 31 | ! return (ret); | |
| 32 | } | |
| 33 | ||
| 34 | /* | |
| 35 | --- 575,581 ---- | |
| 36 | ||
| 37 | bad_format: | |
| 38 | __db_err(dbenv, "%s: unexpected file type or format", name); | |
| 39 | ! return (ret == 0 ? EINVAL : ret); | |
| 40 | } | |
| 41 | ||
| 42 | /* |