git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use dedicated union member for option offsets
[users/jgh/exim.git]
/
src
/
src
/
local_scan.h
diff --git
a/src/src/local_scan.h
b/src/src/local_scan.h
index da9a8911adbc703d4971bd9b882807604b8c7b7a..7243f6afcc32506423ab52deecb047168767b92a 100644
(file)
--- a/
src/src/local_scan.h
+++ b/
src/src/local_scan.h
@@
-2,14
+2,19
@@
* Exim - an Internet mail transport agent *
*************************************************/
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
18
*/
+/* Copyright (c) University of Cambridge 1995 - 20
20
*/
/* See the file NOTICE for conditions of use and distribution. */
/* This file is the header that is the only Exim header to be included in the
source for the local_scan.c() function. It contains definitions that are made
/* See the file NOTICE for conditions of use and distribution. */
/* This file is the header that is the only Exim header to be included in the
source for the local_scan.c() function. It contains definitions that are made
-available for use in that function, and which are documented.
+available for use in that function, and which are documented. That source
+should first #define LOCAL_SCAN
-This API is also used for functions called by the ${dlfunc expansion item. */
+This API is also used for functions called by the ${dlfunc expansion item.
+Source for those should first #define DLFUNC_IMPL and then include this file.
+Coders of dlfunc routines should read the notes on tainting at the start of
+store.c
+*/
/* Some basic types that make some things easier, the Exim configuration
/* Some basic types that make some things easier, the Exim configuration
@@
-98,8
+103,8
@@
ABI is changed in a non backward compatible way. The minor number is increased
each time a new feature is added (in a way that doesn't break backward
compatibility). */
each time a new feature is added (in a way that doesn't break backward
compatibility). */
-#define LOCAL_SCAN_ABI_VERSION_MAJOR
3
-#define LOCAL_SCAN_ABI_VERSION_MINOR
1
+#define LOCAL_SCAN_ABI_VERSION_MAJOR
4
+#define LOCAL_SCAN_ABI_VERSION_MINOR
0
#define LOCAL_SCAN_ABI_VERSION \
LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR
#define LOCAL_SCAN_ABI_VERSION \
LOCAL_SCAN_ABI_VERSION_MAJOR.LOCAL_SCAN_ABI_VERSION_MINOR
@@
-115,10
+120,15
@@
typedef struct header_line {
/* Entries in lists options are in this form. */
typedef struct {
/* Entries in lists options are in this form. */
typedef struct {
- const char *name; /* should have been uschar but too late now */
- int type;
- void *value;
+ const char * name; /* should have been uschar but too late now */
+ int type;
+ union {
+ void * value;
+ long offset;
+ void (* fn)();
+ } v;
} optionlist;
} optionlist;
+#define OPT_OFF(s, field) {.offset = offsetof(s, field)}
/* Structure for holding information about an envelope address. The errors_to
field is always NULL except for one_time aliases that had errors_to on the
/* Structure for holding information about an envelope address. The errors_to
field is always NULL except for one_time aliases that had errors_to on the