aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/graph.c1
-rw-r--r--src/html.gram.y34
-rw-r--r--src/html.lex.l10
-rw-r--r--src/log.c16
-rw-r--r--src/main.c77
-rw-r--r--src/readconfig.c32
-rw-r--r--src/report.c40
-rw-r--r--src/stat.c65
-rw-r--r--src/tagr.h5
9 files changed, 149 insertions, 131 deletions
diff --git a/src/graph.c b/src/graph.c
index bfd00cb..1464e8b 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -51,12 +51,13 @@ int color_percent[3] = { 239,159,79 };
51int graph_xsize = 460; 51int graph_xsize = 460;
52int graph_ysize = 100; 52int graph_ysize = 100;
53 53
54int graph_h_margin[2] = { 100, 14 }; 54int graph_h_margin[2] = { 100, 14 };
55int graph_v_margin[2] = { 14, 35 }; 55int graph_v_margin[2] = { 14, 35 };
56 56
57/* FIXME: I18N?? */
57char *rate_unit = "Bytes per Second"; 58char *rate_unit = "Bytes per Second";
58 59
59#define make_color_index(g, ar) \ 60#define make_color_index(g, ar) \
60 gdImageColorAllocate (g, (ar)[0], (ar)[1], (ar)[2]) 61 gdImageColorAllocate (g, (ar)[0], (ar)[1], (ar)[2])
61 62
62static void 63static void
diff --git a/src/html.gram.y b/src/html.gram.y
index fae64ff..e488494 100644
--- a/src/html.gram.y
+++ b/src/html.gram.y
@@ -110,13 +110,13 @@ expr : value
110 { 110 {
111 if ($1.type == unspecified_value 111 if ($1.type == unspecified_value
112 || $3.type == unspecified_value) 112 || $3.type == unspecified_value)
113 init_value (&$$, unspecified_value, NULL); 113 init_value (&$$, unspecified_value, NULL);
114 else if ($1.type != $3.type) 114 else if ($1.type != $3.type)
115 { 115 {
116 yyerror ("type mismatch in addition"); 116 yyerror (_("type mismatch in addition"));
117 init_value (&$$, unspecified_value, NULL); 117 init_value (&$$, unspecified_value, NULL);
118 } 118 }
119 else 119 else
120 { 120 {
121 $$.type = $1.type; 121 $$.type = $1.type;
122 deduce_format (&$$, &$1, &$3); 122 deduce_format (&$$, &$1, &$3);
@@ -142,18 +142,18 @@ expr : value
142 { 142 {
143 if ($1.type == unspecified_value 143 if ($1.type == unspecified_value
144 || $3.type == unspecified_value) 144 || $3.type == unspecified_value)
145 init_value (&$$, unspecified_value, NULL); 145 init_value (&$$, unspecified_value, NULL);
146 else if ($1.type != $3.type) 146 else if ($1.type != $3.type)
147 { 147 {
148 yyerror ("type mismatch in subtraction"); 148 yyerror (_("type mismatch in subtraction"));
149 init_value (&$$, unspecified_value, NULL); 149 init_value (&$$, unspecified_value, NULL);
150 } 150 }
151 else if ($1.type == string_value) 151 else if ($1.type == string_value)
152 { 152 {
153 yyerror ("subtraction not defined for strings"); 153 yyerror (_("subtraction not defined for strings"));
154 init_value (&$$, unspecified_value, NULL); 154 init_value (&$$, unspecified_value, NULL);
155 } 155 }
156 else 156 else
157 { 157 {
158 $$.type = $1.type; 158 $$.type = $1.type;
159 deduce_format (&$$, &$1, &$3); 159 deduce_format (&$$, &$1, &$3);
@@ -164,18 +164,18 @@ expr : value
164 { 164 {
165 if ($1.type == unspecified_value 165 if ($1.type == unspecified_value
166 || $3.type == unspecified_value) 166 || $3.type == unspecified_value)
167 init_value (&$$, unspecified_value, NULL); 167 init_value (&$$, unspecified_value, NULL);
168 else if ($1.type != $3.type) 168 else if ($1.type != $3.type)
169 { 169 {
170 yyerror ("type mismatch in multiplication"); 170 yyerror (_("type mismatch in multiplication"));
171 init_value (&$$, unspecified_value, NULL); 171 init_value (&$$, unspecified_value, NULL);
172 } 172 }
173 else if ($1.type == string_value) 173 else if ($1.type == string_value)
174 { 174 {
175 yyerror ("multiplication not defined for strings"); 175 yyerror (_("multiplication not defined for strings"));
176 init_value (&$$, unspecified_value, NULL); 176 init_value (&$$, unspecified_value, NULL);
177 } 177 }
178 else 178 else
179 { 179 {
180 $$.type = $1.type; 180 $$.type = $1.type;
181 deduce_format (&$$, &$1, &$3); 181 deduce_format (&$$, &$1, &$3);
@@ -186,23 +186,23 @@ expr : value
186 { 186 {
187 if ($1.type == unspecified_value 187 if ($1.type == unspecified_value
188 || $3.type == unspecified_value) 188 || $3.type == unspecified_value)
189 init_value (&$$, unspecified_value, NULL); 189 init_value (&$$, unspecified_value, NULL);
190 else if ($1.type != $3.type) 190 else if ($1.type != $3.type)
191 { 191 {
192 yyerror ("type mismatch in division"); 192 yyerror (_("type mismatch in division"));
193 init_value (&$$, unspecified_value, NULL); 193 init_value (&$$, unspecified_value, NULL);
194 } 194 }
195 else if ($1.type == string_value) 195 else if ($1.type == string_value)
196 { 196 {
197 yyerror ("division not defined for strings"); 197 yyerror (_("division not defined for strings"));
198 init_value (&$$, unspecified_value, NULL); 198 init_value (&$$, unspecified_value, NULL);
199 } 199 }
200 else if (fabs ($3.v.number) < 1.0e-5) 200 else if (fabs ($3.v.number) < 1.0e-5)
201 { 201 {
202 yyerror ("division by zero"); 202 yyerror (_("division by zero"));
203 init_value (&$$, unspecified_value, NULL); 203 init_value (&$$, unspecified_value, NULL);
204 } 204 }
205 else 205 else
206 { 206 {
207 $$.type = $1.type; 207 $$.type = $1.type;
208 deduce_format (&$$, &$1, &$3); 208 deduce_format (&$$, &$1, &$3);
@@ -212,13 +212,13 @@ expr : value
212 | '-' expr %prec UMINUS 212 | '-' expr %prec UMINUS
213 { 213 {
214 if ($2.type == unspecified_value) 214 if ($2.type == unspecified_value)
215 init_value (&$$, unspecified_value, NULL); 215 init_value (&$$, unspecified_value, NULL);
216 else if ($2.type == string_value) 216 else if ($2.type == string_value)
217 { 217 {
218 yyerror ("unary minus not defined for strings"); 218 yyerror (_("unary minus not defined for strings"));
219 init_value (&$$, unspecified_value, NULL); 219 init_value (&$$, unspecified_value, NULL);
220 } 220 }
221 else 221 else
222 { 222 {
223 $$ = $2; 223 $$ = $2;
224 $$.v.number = - $2.v.number; 224 $$.v.number = - $2.v.number;
@@ -227,13 +227,13 @@ expr : value
227 | '+' expr %prec UMINUS 227 | '+' expr %prec UMINUS
228 { 228 {
229 if ($2.type == unspecified_value) 229 if ($2.type == unspecified_value)
230 init_value (&$$, unspecified_value, NULL); 230 init_value (&$$, unspecified_value, NULL);
231 else if ($2.type == string_value) 231 else if ($2.type == string_value)
232 { 232 {
233 yyerror ("unary plus not defined for strings"); 233 yyerror (_("unary plus not defined for strings"));
234 init_value (&$$, unspecified_value, NULL); 234 init_value (&$$, unspecified_value, NULL);
235 } 235 }
236 else 236 else
237 { 237 {
238 $$ = $2; 238 $$ = $2;
239 } 239 }
@@ -270,33 +270,33 @@ create_html (pp_tab_t *tab, char *file, char *dest)
270 270
271 tmp_file_name = mkfilename (NULL, dest, ".tmp"); 271 tmp_file_name = mkfilename (NULL, dest, ".tmp");
272 272
273 tmp_file = fopen (tmp_file_name, "w"); 273 tmp_file = fopen (tmp_file_name, "w");
274 if (!tmp_file) 274 if (!tmp_file)
275 { 275 {
276 logmsg (L_ERR, "cannot open output file `%s': %s", 276 logmsg (L_ERR, _("cannot open output file `%s': %s"),
277 file, strerror (errno)); 277 file, strerror (errno));
278 html_close (); 278 html_close ();
279 return 1; 279 return 1;
280 } 280 }
281 281
282 ident_tab = tab; 282 ident_tab = tab;
283 rc = yyparse (); 283 rc = yyparse ();
284 fclose (tmp_file); 284 fclose (tmp_file);
285 if (rc == 0) 285 if (rc == 0)
286 { 286 {
287 if (unlink (dest) && errno != ENOENT) 287 if (unlink (dest) && errno != ENOENT)
288 { 288 {
289 logmsg (L_ERR, "cannot unlink file `%s': %s", 289 logmsg (L_ERR, _("cannot unlink file `%s': %s"),
290 dest, strerror (errno)); 290 dest, strerror (errno));
291 rc = 1; 291 rc = 1;
292 } 292 }
293 293
294 if (rename (tmp_file_name, dest)) 294 if (rename (tmp_file_name, dest))
295 { 295 {
296 logmsg (L_ERR, "cannot rename `%s' to `%s': %s", 296 logmsg (L_ERR, _("cannot rename `%s' to `%s': %s"),
297 tmp_file_name, dest, 297 tmp_file_name, dest,
298 strerror (errno)); 298 strerror (errno));
299 rc = 1; 299 rc = 1;
300 } 300 }
301 } 301 }
302 free (tmp_file_name); 302 free (tmp_file_name);
@@ -491,22 +491,22 @@ read_symtab (pp_tab_t **tab, const char *name)
491 continue; 491 continue;
492 492
493 p = buf; 493 p = buf;
494 cmd = *p++;