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
Recast more internal string routines to use growable-strings
[exim.git]
/
src
/
src
/
header.c
diff --git
a/src/src/header.c
b/src/src/header.c
index dad1638cbb6931aca1f7c99e702932c84026791f..74df32ca1decb2c7f52f9420910b2d5eb44a4a6c 100644
(file)
--- a/
src/src/header.c
+++ b/
src/src/header.c
@@
-98,16
+98,18
@@
header_line **hptr;
uschar *p, *q;
uschar buffer[HEADER_ADD_BUFFER_SIZE];
uschar *p, *q;
uschar buffer[HEADER_ADD_BUFFER_SIZE];
+gstring gs = { .size = HEADER_ADD_BUFFER_SIZE, .ptr = 0, .s = buffer };
-if (
header_last == NULL
) return;
+if (
!header_last
) return;
-if (!string_vformat(
buffer, sizeof(buffer)
, format, ap))
+if (!string_vformat(
&gs, FALSE
, format, ap))
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "string too long in header_add: "
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "string too long in header_add: "
- "%.100s ...", buffer);
+ "%.100s ...", string_from_gstring(&gs));
+string_from_gstring(&gs);
/* Find where to insert this header */
/* Find where to insert this header */
-if (
name == NULL
)
+if (
!name
)
{
if (after)
{
{
if (after)
{
@@
-119,10
+121,10
@@
if (name == NULL)
hptr = &header_list;
/* header_list->text can be NULL if we get here between when the new
hptr = &header_list;
/* header_list->text can be NULL if we get here between when the new
- received header is allocated and when it is ac
ut
ally filled in. We want
+ received header is allocated and when it is ac
tu
ally filled in. We want
that header to be first, so skip it for now. */
that header to be first, so skip it for now. */
- if (
header_list->text == NULL
)
+ if (
!header_list->text
)
hptr = &header_list->next;
h = *hptr;
}
hptr = &header_list->next;
h = *hptr;
}
@@
-132,17
+134,16
@@
else
{
int len = Ustrlen(name);
{
int len = Ustrlen(name);
- /* Find the first non-deleted header with
t
the correct name. */
+ /* Find the first non-deleted header with the correct name. */
- for (hptr = &header_list; (h = *hptr) != NULL; hptr = &(h->next))
- {
- if (header_testname(h, name, len, TRUE)) break;
- }
+ for (hptr = &header_list; (h = *hptr); hptr = &h->next)
+ if (header_testname(h, name, len, TRUE))
+ break;
/* Handle the case where no header is found. To insert at the bottom, nothing
needs to be done. */
/* Handle the case where no header is found. To insert at the bottom, nothing
needs to be done. */
- if (
h == NULL
)
+ if (
!h
)
{
if (topnot)
{
{
if (topnot)
{
@@
-155,14
+156,12
@@
else
true. In this case, we want to include deleted headers in the block. */
else if (after)
true. In this case, we want to include deleted headers in the block. */
else if (after)
- {
for (;;)
{
for (;;)
{
- if (
h->next == NULL
|| !header_testname(h, name, len, FALSE)) break;
+ if (
!h->next
|| !header_testname(h, name, len, FALSE)) break;
hptr = &(h->next);
h = h->next;
}
hptr = &(h->next);
h = h->next;
}
- }
}
/* Loop for multiple header lines, taking care about continuations. At this
}
/* Loop for multiple header lines, taking care about continuations. At this
@@
-174,7
+173,7
@@
for (p = q = buffer; *p != 0; )
for (;;)
{
q = Ustrchr(q, '\n');
for (;;)
{
q = Ustrchr(q, '\n');
- if (
q == NULL
) q = p + Ustrlen(p);
+ if (
!q
) q = p + Ustrlen(p);
if (*(++q) != ' ' && *q != '\t') break;
}
if (*(++q) != ' ' && *q != '\t') break;
}
@@
-187,7
+186,7
@@
for (p = q = buffer; *p != 0; )
*hptr = new;
hptr = &(new->next);
*hptr = new;
hptr = &(new->next);
- if (
h == NULL
) header_last = new;
+ if (
!h
) header_last = new;
p = q;
}
}
p = q;
}
}