git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Debug: feed startup "whats supported" info through normal debug channel
[exim.git]
/
src
/
src
/
lookups
/
cdb.c
diff --git
a/src/src/lookups/cdb.c
b/src/src/lookups/cdb.c
index e0faa905d138a11a03a47c35f927fee2ab38199f..7b9c2cdfd2107b211405a42885d702c580191818 100644
(file)
--- a/
src/src/lookups/cdb.c
+++ b/
src/src/lookups/cdb.c
@@
-7,7
+7,7
@@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
* Copyright (c) 1998 Nigel Metheringham, Planet Online Ltd
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
*
* Copyright (c) 1998 Nigel Metheringham, Planet Online Ltd
- * Copyright (c) The Exim Maintainers 2020
+ * Copyright (c) The Exim Maintainers 2020
- 2021
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-157,19
+157,14
@@
void * mapbuf;
if ((fileno = Uopen(filename, O_RDONLY, 0)) < 0)
{
if ((fileno = Uopen(filename, O_RDONLY, 0)) < 0)
{
- int save_errno = errno;
- *errmsg = string_open_failed(errno, "%s for cdb lookup", filename);
- errno = save_errno;
+ *errmsg = string_open_failed("%s for cdb lookup", filename);
return NULL;
}
if (fstat(fileno, &statbuf) != 0)
{
return NULL;
}
if (fstat(fileno, &statbuf) != 0)
{
- int save_errno = errno;
- *errmsg = string_open_failed(errno,
- "fstat(%s) failed - cannot do cdb lookup",
+ *errmsg = string_open_failed("fstat(%s) failed - cannot do cdb lookup",
filename);
filename);
- errno = save_errno;
return NULL;
}
return NULL;
}
@@
-178,11
+173,7
@@
CDB_HASH_TABLE bytes long */
if (statbuf.st_size < CDB_HASH_TABLE)
{
if (statbuf.st_size < CDB_HASH_TABLE)
{
- int save_errno = errno;
- *errmsg = string_open_failed(errno,
- "%s too short for cdb lookup",
- filename);
- errno = save_errno;
+ *errmsg = string_open_failed("%s too short for cdb lookup", filename);
return NULL;
}
return NULL;
}
@@
-231,8
+222,7
@@
if (cdb_bread(fileno, cdbp->cdb_offsets, CDB_HASH_TABLE) == -1)
/* read of hash table failed, oh dear, oh..... time to give up I think....
call the close routine (deallocs the memory), and return NULL */
/* read of hash table failed, oh dear, oh..... time to give up I think....
call the close routine (deallocs the memory), and return NULL */
- *errmsg = string_open_failed(errno,
- "cannot read header from %s for cdb lookup",
+ *errmsg = string_open_failed("cannot read header from %s for cdb lookup",
filename);
cdb_close(cdbp);
return NULL;
filename);
cdb_close(cdbp);
return NULL;
@@
-468,12
+458,13
@@
if (cdbp->cdb_map)
#include "../version.h"
#include "../version.h"
-void
-cdb_version_report(
FILE *f
)
+gstring *
+cdb_version_report(
gstring * g
)
{
#ifdef DYNLOOKUP
{
#ifdef DYNLOOKUP
-
fprintf(f
, "Library version: CDB: Exim version %s\n", EXIM_VERSION_STR);
+
g = string_fmt_append(g
, "Library version: CDB: Exim version %s\n", EXIM_VERSION_STR);
#endif
#endif
+return g;
}
}