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
More abstraction of the gstring API
[exim.git]
/
src
/
src
/
sieve.c
diff --git
a/src/src/sieve.c
b/src/src/sieve.c
index 0b347e48df68b059190312063aa05a68bce0f485..4793d5756c9a1a6f451a4e8d916b1b8d097d6b95 100644
(file)
--- a/
src/src/sieve.c
+++ b/
src/src/sieve.c
@@
-439,8
+439,7
@@
if (*uri && *uri!='?')
{
gstring * g = string_catn(NULL, start, uri-start);
{
gstring * g = string_catn(NULL, start, uri-start);
- to.character = string_from_gstring(g);
- to.length = g->ptr;
+ to.length = len_string_from_gstring(g, &to.character);
if (uri_decode(&to)==-1)
{
filter->errmsg=US"Invalid URI encoding";
if (uri_decode(&to)==-1)
{
filter->errmsg=US"Invalid URI encoding";
@@
-472,8
+471,7
@@
if (*uri=='?')
{
gstring * g = string_catn(NULL, start, uri-start);
{
gstring * g = string_catn(NULL, start, uri-start);
- hname.character = string_from_gstring(g);
- hname.length = g->ptr;
+ hname.length = len_string_from_gstring(g, &hname.character);
if (uri_decode(&hname)==-1)
{
filter->errmsg=US"Invalid URI encoding";
if (uri_decode(&hname)==-1)
{
filter->errmsg=US"Invalid URI encoding";
@@
-494,8
+492,7
@@
if (*uri=='?')
{
gstring * g = string_catn(NULL, start, uri-start);
{
gstring * g = string_catn(NULL, start, uri-start);
- hname.character = string_from_gstring(g);
- hname.length = g->ptr;
+ hname.length = len_string_from_gstring(g, &hname.character);
if (uri_decode(&hvalue)==-1)
{
filter->errmsg=US"Invalid URI encoding";
if (uri_decode(&hvalue)==-1)
{
filter->errmsg=US"Invalid URI encoding";
@@
-541,8
+538,7
@@
if (*uri=='?')
g = string_catn(g, hvalue.character, hvalue.length);
g = string_catn(g, CUS "\n", 1);
g = string_catn(g, hvalue.character, hvalue.length);
g = string_catn(g, CUS "\n", 1);
- header->character = string_from_gstring(g);
- header->length = g->ptr;
+ hname.length = len_string_from_gstring(g, &hname.character);
}
}
if (*uri=='&') ++uri;
}
}
if (*uri=='&') ++uri;
@@
-1482,10
+1478,7
@@
if (*filter->pc=='"') /* quoted string */
++filter->pc;
if (g)
++filter->pc;
if (g)
- {
- data->character = string_from_gstring(g);
- data->length = g->ptr;
- }
+ data->length = len_string_from_gstring(g, &data->character);
else
data->character = US"\0";
/* that way, there will be at least one character allocated */
else
data->character = US"\0";
/* that way, there will be at least one character allocated */
@@
-1569,10
+1562,7
@@
else if (Ustrncmp(filter->pc,CUS "text:",5)==0) /* multiline string */
#endif
{
if (g)
#endif
{
if (g)
- {
- data->character = string_from_gstring(g);
- data->length = g->ptr;
- }
+ data->length = len_string_from_gstring(g, &data->character);
else
data->character = US"\0";
/* that way, there will be at least one character allocated */
else
data->character = US"\0";
/* that way, there will be at least one character allocated */
@@
-3303,7
+3293,7
@@
while (*filter->pc)
if (subject.length==-1)
{
if (subject.length==-1)
{
- uschar *subject_def;
+ uschar *
subject_def;
subject_def = expand_string(US"${if def:header_subject {true}{false}}");
if (subject_def && Ustrcmp(subject_def,"true")==0)
subject_def = expand_string(US"${if def:header_subject {true}{false}}");
if (subject_def && Ustrcmp(subject_def,"true")==0)
@@
-3312,13
+3302,12
@@
while (*filter->pc)
expand_header(&subject,&str_subject);
g = string_catn(g, subject.character, subject.length);
expand_header(&subject,&str_subject);
g = string_catn(g, subject.character, subject.length);
- subject.character = string_from_gstring(g);
- subject.length = g->ptr;
+ subject.length = len_string_from_gstring(g, &subject.character);
}
else
{
}
else
{
- subject.character
=
US"Automated reply";
- subject.length
=
Ustrlen(subject.character);
+ subject.character
=
US"Automated reply";
+ subject.length
=
Ustrlen(subject.character);
}
}
}
}