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
/
json.c
diff --git
a/src/src/lookups/json.c
b/src/src/lookups/json.c
index 58f9b6ae6f2c79075b370885e409d57b987d4afd..7f2478b63045a3acf38108b7b47f4cf0b553b8fc 100644
(file)
--- a/
src/src/lookups/json.c
+++ b/
src/src/lookups/json.c
@@
-2,7
+2,8
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) Jeremy Harris 2019 */
+/* Copyright (c) Jeremy Harris 2019-2020 */
+/* Copyright (c) The Exim Maintainers 2021 */
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
/* See the file NOTICE for conditions of use and distribution. */
#include "../exim.h"
@@
-47,12
+48,7
@@
FILE * f;
json_set_alloc_funcs(json_malloc, json_free);
if (!(f = Ufopen(filename, "rb")))
json_set_alloc_funcs(json_malloc, json_free);
if (!(f = Ufopen(filename, "rb")))
- {
- int save_errno = errno;
- *errmsg = string_open_failed(errno, "%s for json search", filename);
- errno = save_errno;
- return NULL;
- }
+ *errmsg = string_open_failed("%s for json search", filename);
return f;
}
return f;
}
@@
-89,9
+85,6
@@
json_error_t jerr;
uschar * key;
int sep = 0;
uschar * key;
int sep = 0;
-length = length; /* Keep picky compilers happy */
-do_cache = do_cache; /* Keep picky compilers happy */
-
rewind(f);
if (!(j = json_loadf(f, 0, &jerr)))
{
rewind(f);
if (!(j = json_loadf(f, 0, &jerr)))
{
@@
-165,10
+158,10
@@
json_close(void *handle)
#include "../version.h"
#include "../version.h"
-void
-json_version_report(
FILE *f
)
+gstring *
+json_version_report(
gstring * g
)
{
{
-
fprintf(f
, "Library version: json: Jansonn version %s\n", JANSSON_VERSION);
+
return string_fmt_append(g
, "Library version: json: Jansonn version %s\n", JANSSON_VERSION);
}
}