-EXIM_DBOPEN(filename, dirname, O_RDONLY, 0, &yield);
-if (!yield)
- {
- int save_errno = errno;
- *errmsg = string_open_failed(errno, "%s as a %s file", filename, EXIM_DBTYPE);
- errno = save_errno;
- }
+if (!(yield = exim_dbopen(filename, dirname, O_RDONLY, 0)))
+ *errmsg = string_open_failed("%s as a %s file", filename, EXIM_DBTYPE);