1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
|
From: Kokan <kokaipeter@gmail.com>
Date: Fri, 24 Jul 2020 10:44:22 +0200
Subject: syslogformat: utilize sd_step
Signed-off-by: Kokan <kokaipeter@gmail.com>
Origin: https://github.com/syslog-ng/syslog-ng/commit/9ec67869fd9b784f56804f175ef8eda68662cd0d
---
modules/syslogformat/syslog-format.c | 54 ++++++++++++------------------------
1 file changed, 18 insertions(+), 36 deletions(-)
diff --git a/modules/syslogformat/syslog-format.c b/modules/syslogformat/syslog-format.c
index 8c70159..ec4b570 100644
--- a/modules/syslogformat/syslog-format.c
+++ b/modules/syslogformat/syslog-format.c
@@ -65,8 +65,7 @@ log_msg_parse_pri(LogMessage *self, const guchar **data, gint *length, guint fla
if (left && src[0] == '<')
{
- src++;
- left--;
+ sd_step(&src, &left);
pri = 0;
while (left && *src != '>')
{
@@ -78,14 +77,12 @@ log_msg_parse_pri(LogMessage *self, const guchar **data, gint *length, guint fla
{
return FALSE;
}
- src++;
- left--;
+ sd_step(&src, &left);
}
self->pri = pri;
if (left)
{
- src++;
- left--;
+ sd_step(&src, &left);
}
}
/* No priority info in the buffer? Just assign a default. */
@@ -108,8 +105,7 @@ log_msg_parse_skip_chars(LogMessage *self, const guchar **data, gint *length, co
while (max_len && left && _strchr_optimized_for_single_char_haystack(chars, *src))
{
- src++;
- left--;
+ sd_step(&src, &left);
num_skipped++;
if (max_len >= 0)
max_len--;
@@ -127,8 +123,7 @@ log_msg_parse_skip_space(LogMessage *self, const guchar **data, gint *length)
if (left > 0 && *src == ' ')
{
- src++;
- left--;
+ sd_step(&src, &left);
}
else
{
@@ -149,8 +144,7 @@ log_msg_parse_skip_chars_until(LogMessage *self, const guchar **data, gint *leng
while (left && _strchr_optimized_for_single_char_haystack(delims, *src) == 0)
{
- src++;
- left--;
+ sd_step(&src, &left);
num_skipped++;
}
*data = src;
@@ -200,11 +194,9 @@ log_msg_parse_cisco_sequence_id(LogMessage *self, const guchar **data, gint *len
{
if (!isdigit(*src))
return;
- src++;
- left--;
+ sd_step(&src, &left);
}
- src++;
- left--;
+ sd_step(&src, &left);
/* if the next char is not space, then we may try to read a date */
@@ -230,15 +222,13 @@ log_msg_parse_cisco_timestamp_attributes(LogMessage *self, const guchar **data,
{
if (!(parse_flags & LP_NO_PARSE_DATE))
log_msg_set_value(self, handles.is_synced, "0", 1);
- src++;
- left--;
+ sd_step(&src, &left);
}
else if (G_UNLIKELY(src[0] == '.'))
{
if (!(parse_flags & LP_NO_PARSE_DATE))
log_msg_set_value(self, handles.is_synced, "1", 1);
- src++;
- left--;
+ sd_step(&src, &left);
}
*data = src;
*length = left;
@@ -308,8 +298,7 @@ log_msg_parse_version(LogMessage *self, const guchar **data, gint *length)
{
return FALSE;
}
- src++;
- left--;
+ sd_step(&src, &left);
}
if (version != 1)
return FALSE;
@@ -331,8 +320,7 @@ log_msg_parse_legacy_program_name(LogMessage *self, const guchar **data, gint *l
prog_start = src;
while (left && *src != ' ' && *src != '[' && *src != ':')
{
- src++;
- left--;
+ sd_step(&src, &left);
}
log_msg_set_value(self, LM_V_PROGRAM, (gchar *) prog_start, src - prog_start);
if (left > 0 && *src == '[')
@@ -340,8 +328,7 @@ log_msg_parse_legacy_program_name(LogMessage *self, const guchar **data, gint *l
const guchar *pid_start = src + 1;
while (left && *src != ' ' && *src != ']' && *src != ':')
{
- src++;
- left--;
+ sd_step(&src, &left);
}
if (left)
{
@@ -349,19 +336,16 @@ log_msg_parse_legacy_program_name(LogMessage *self, const guchar **data, gint *l
}
if (left > 0 && *src == ']')
{
- src++;
- left--;
+ sd_step(&src, &left);
}
}
if (left > 0 && *src == ':')
{
- src++;
- left--;
+ sd_step(&src, &left);
}
if (left > 0 && *src == ' ')
{
- src++;
- left--;
+ sd_step(&src, &left);
}
if ((flags & LP_STORE_LEGACY_MSGHDR))
{
@@ -475,8 +459,7 @@ log_msg_parse_hostname(LogMessage *self, const guchar **data, gint *length,
break;
}
hostname_buf[dst++] = *src;
- src++;
- left--;
+ sd_step(&src, &left);
}
hostname_buf[dst] = 0;
@@ -555,8 +538,7 @@ log_msg_parse_sd(LogMessage *self, const guchar **data, gint *length, const MsgF
if (left && src[0] == '-')
{
/* Nothing to do here */
- src++;
- left--;
+ sd_step(&src, &left);
}
else if (left && src[0] == '[')
{
|
