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
Rename substructure for ease of debugging
[exim.git]
/
src
/
src
/
routers
/
rf_get_munge_headers.c
diff --git
a/src/src/routers/rf_get_munge_headers.c
b/src/src/routers/rf_get_munge_headers.c
index a4a13b04fe716471f235c15bc402702d8f4c75cd..d4af84f6d0fcc15281236f09a0ab967b4d5d51a8 100644
(file)
--- a/
src/src/routers/rf_get_munge_headers.c
+++ b/
src/src/routers/rf_get_munge_headers.c
@@
-32,11
+32,11
@@
rf_get_munge_headers(address_item *addr, router_instance *rblock,
header_line **extra_headers, uschar **remove_headers)
{
/* Default is to retain existing headers */
header_line **extra_headers, uschar **remove_headers)
{
/* Default is to retain existing headers */
-*extra_headers = addr->p.extra_headers;
+*extra_headers = addr->p
rop
.extra_headers;
if (rblock->extra_headers)
{
if (rblock->extra_headers)
{
- uschar * list = rblock->extra_headers;
+
const
uschar * list = rblock->extra_headers;
int sep = '\n';
uschar * s;
int slen;
int sep = '\n';
uschar * s;
int slen;
@@
-82,17
+82,16
@@
if (rblock->extra_headers)
}
/* Default is to retain existing removes */
}
/* Default is to retain existing removes */
-*remove_headers = addr->p.remove_headers;
+*remove_headers = addr->p
rop
.remove_headers;
/* Expand items from colon-sep list separately, then build new list */
if (rblock->remove_headers)
{
/* Expand items from colon-sep list separately, then build new list */
if (rblock->remove_headers)
{
- uschar * list = rblock->remove_headers;
+
const
uschar * list = rblock->remove_headers;
int sep = ':';
uschar * s;
int sep = ':';
uschar * s;
- uschar buffer[128];
- while ((s = string_nextinlist(&list, &sep,
buffer, sizeof(buffer)
)))
+ while ((s = string_nextinlist(&list, &sep,
NULL, 0
)))
if (!(s = expand_string(s)))
{
if (!expand_string_forcedfail)
if (!(s = expand_string(s)))
{
if (!expand_string_forcedfail)