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
SPDX: Mass-update to GPL-2.0-or-later
[exim.git]
/
src
/
src
/
lookups
/
whoson.c
diff --git
a/src/src/lookups/whoson.c
b/src/src/lookups/whoson.c
index b4e64d2a87c68d05777139166bd57d900c978561..cd6c7e85c6ee6bcc98b9d4e2cc0d4150e0e17af7 100644
(file)
--- a/
src/src/lookups/whoson.c
+++ b/
src/src/lookups/whoson.c
@@
-2,9
+2,10
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
+/* Copyright (c) The Exim Maintainers 2020 - 2022 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
/* Copyright (c) University of Cambridge 1995 - 2015 */
-/* Copyright (c) The Exim Maintainers 2020 */
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/* This code originally came from Robert Wal. */
/* This code originally came from Robert Wal. */
@@
-23,8
+24,6
@@
static void *
whoson_open(const uschar * filename, uschar ** errmsg)
{
static void *
whoson_open(const uschar * filename, uschar ** errmsg)
{
-filename = filename; /* Keep picky compilers happy */
-errmsg = errmsg;
return (void *)(1); /* Just return something non-null */
}
return (void *)(1); /* Just return something non-null */
}
@@
-40,11
+39,6
@@
whoson_find(void * handle, const uschar * filename, uschar * query, int length,
uschar ** result, uschar ** errmsg, uint * do_cache, const uschar * opts)
{
uschar buffer[80];
uschar ** result, uschar ** errmsg, uint * do_cache, const uschar * opts)
{
uschar buffer[80];
-handle = handle; /* Keep picky compilers happy */
-filename = filename;
-length = length;
-errmsg = errmsg;
-do_cache = do_cache;
switch (wso_query(CS query, CS buffer, sizeof(buffer)))
{
switch (wso_query(CS query, CS buffer, sizeof(buffer)))
{
@@
-71,13
+65,16
@@
switch (wso_query(CS query, CS buffer, sizeof(buffer)))
#include "../version.h"
#include "../version.h"
-void
-whoson_version_report(
FILE *f
)
+gstring *
+whoson_version_report(
gstring * g
)
{
{
-fprintf(f, "Library version: Whoson: Runtime: %s\n", wso_version());
+g = string_fmt_append(g,
+ "Library version: Whoson: Runtime: %s\n", wso_version());
#ifdef DYNLOOKUP
#ifdef DYNLOOKUP
-fprintf(f, " Exim version %s\n", EXIM_VERSION_STR);
+g = string_fmt_append(g,
+ " Exim version %s\n", EXIM_VERSION_STR);
#endif
#endif
+return g;
}
static lookup_info _lookup_info = {
}
static lookup_info _lookup_info = {