Removed spurions indications of action
names in diagnostic messages. Sieve_error prepends them automatically now.
Showing
5 changed files
with
38 additions
and
101 deletions
... | @@ -60,10 +60,7 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -60,10 +60,7 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags) |
60 | sieve_value_t *val = sieve_value_get (args, 0); | 60 | sieve_value_t *val = sieve_value_get (args, 0); |
61 | if (!val) | 61 | if (!val) |
62 | { | 62 | { |
63 | sieve_error (mach, | 63 | sieve_error (mach, _("cannot get filename!")); |
64 | /* TRANSLATORS: 'fileinto' is the name of a Sieve action. | ||
65 | Do not translate it! */ | ||
66 | _("fileinto: cannot get filename!")); | ||
67 | sieve_abort (mach); | 64 | sieve_abort (mach); |
68 | } | 65 | } |
69 | sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string); | 66 | sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string); |
... | @@ -73,10 +70,7 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -73,10 +70,7 @@ sieve_action_fileinto (sieve_machine_t mach, list_t args, list_t tags) |
73 | rc = message_save_to_mailbox (mach->msg, mach->ticket, mach->mu_debug, | 70 | rc = message_save_to_mailbox (mach->msg, mach->ticket, mach->mu_debug, |
74 | val->v.string); | 71 | val->v.string); |
75 | if (rc) | 72 | if (rc) |
76 | sieve_error (mach, | 73 | sieve_error (mach, _("cannot save to mailbox: %s"), |
77 | /* TRANSLATORS: 'fileinto' is the name of a Sieve action. | ||
78 | Do not translate it! */ | ||
79 | _("fileinto: cannot save to mailbox: %s"), | ||
80 | mu_strerror (rc)); | 74 | mu_strerror (rc)); |
81 | else | 75 | else |
82 | sieve_mark_deleted (mach->msg, 1); | 76 | sieve_mark_deleted (mach->msg, 1); |
... | @@ -245,10 +239,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -245,10 +239,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) |
245 | sieve_value_t *val = sieve_value_get (args, 0); | 239 | sieve_value_t *val = sieve_value_get (args, 0); |
246 | if (!val) | 240 | if (!val) |
247 | { | 241 | { |
248 | sieve_error (mach, | 242 | sieve_error (mach, _("reject: cannot get text!")); |
249 | /* TRANSLATORS: 'reject' is the name of a Sieve action. | ||
250 | Do not translate it! */ | ||
251 | _("reject: cannot get text!")); | ||
252 | sieve_abort (mach); | 243 | sieve_abort (mach); |
253 | } | 244 | } |
254 | sieve_log_action (mach, "REJECT", NULL); | 245 | sieve_log_action (mach, "REJECT", NULL); |
... | @@ -264,9 +255,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -264,9 +255,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) |
264 | if (rc) | 255 | if (rc) |
265 | { | 256 | { |
266 | sieve_error (mach, | 257 | sieve_error (mach, |
267 | /* TRANSLATORS: 'reject' is the name of a Sieve action. | 258 | _("%d: cannot create recipient address <%s>: %s\n"), |
268 | Do not translate it! */ | ||
269 | _("%d: reject - cannot create to address <%s>: %s\n"), | ||
270 | sieve_get_message_num (mach), | 259 | sieve_get_message_num (mach), |
271 | addrtext, mu_strerror (rc)); | 260 | addrtext, mu_strerror (rc)); |
272 | free (addrtext); | 261 | free (addrtext); |
... | @@ -278,9 +267,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -278,9 +267,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) |
278 | if (rc) | 267 | if (rc) |
279 | { | 268 | { |
280 | sieve_error (mach, | 269 | sieve_error (mach, |
281 | /* TRANSLATORS: 'reject' is the name of a Sieve action. | 270 | _("%d: cannot create sender address <%s>: %s\n"), |
282 | Do not translate it! */ | ||
283 | _("%d: reject - cannot create from address <%s>: %s\n"), | ||
284 | sieve_get_message_num (mach), | 271 | sieve_get_message_num (mach), |
285 | sieve_get_daemon_email (mach), | 272 | sieve_get_daemon_email (mach), |
286 | mu_strerror (rc)); | 273 | mu_strerror (rc)); |
... | @@ -294,9 +281,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -294,9 +281,7 @@ sieve_action_reject (sieve_machine_t mach, list_t args, list_t tags) |
294 | mailer_get_url (mailer, &url); | 281 | mailer_get_url (mailer, &url); |
295 | 282 | ||
296 | sieve_error (mach, | 283 | sieve_error (mach, |
297 | /* TRANSLATORS: 'reject' is the name of a Sieve action. | 284 | _("%d: cannot open mailer %s: %s\n"), |
298 | Do not translate it! */ | ||
299 | _("%d: reject - cannot open mailer %s: %s\n"), | ||
300 | sieve_get_message_num (mach), | 285 | sieve_get_message_num (mach), |
301 | url_to_string (url), | 286 | url_to_string (url), |
302 | mu_strerror (rc)); | 287 | mu_strerror (rc)); |
... | @@ -371,9 +356,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -371,9 +356,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) |
371 | sieve_value_t *val = sieve_value_get (args, 0); | 356 | sieve_value_t *val = sieve_value_get (args, 0); |
372 | if (!val) | 357 | if (!val) |
373 | { | 358 | { |
374 | /* TRANSLATORS: 'redirect' is the name of a Sieve action. | 359 | sieve_error (mach, _("cannot get address!")); |
375 | Do not translate it! */ | ||
376 | sieve_error (mach, _("redirect: cannot get address!")); | ||
377 | sieve_abort (mach); | 360 | sieve_abort (mach); |
378 | } | 361 | } |
379 | 362 | ||
... | @@ -381,9 +364,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -381,9 +364,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) |
381 | if (rc) | 364 | if (rc) |
382 | { | 365 | { |
383 | sieve_error (mach, | 366 | sieve_error (mach, |
384 | /* TRANSLATORS: 'redirect' is the name of a Sieve action. | 367 | _("%d: parsing recipient address `%s' failed: %s\n"), |
385 | Do not translate it! */ | ||
386 | _("%d: redirect - parsing to `%s' failed: %s\n"), | ||
387 | sieve_get_message_num (mach), | 368 | sieve_get_message_num (mach), |
388 | val->v.string, mu_strerror (rc)); | 369 | val->v.string, mu_strerror (rc)); |
389 | return 1; | 370 | return 1; |
... | @@ -405,9 +386,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -405,9 +386,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) |
405 | if (rc) | 386 | if (rc) |
406 | { | 387 | { |
407 | sieve_error (mach, | 388 | sieve_error (mach, |
408 | /* TRANSLATORS: 'redirect' is the name of a Sieve action. | 389 | _("%d: cannot get envelope sender: %s\n"), |
409 | Do not translate it! */ | ||
410 | _("%d: redirect - cannot get envelope sender: %s\n"), | ||
411 | sieve_get_message_num (mach), mu_strerror (rc)); | 390 | sieve_get_message_num (mach), mu_strerror (rc)); |
412 | goto end; | 391 | goto end; |
413 | } | 392 | } |
... | @@ -416,9 +395,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -416,9 +395,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) |
416 | if (rc) | 395 | if (rc) |
417 | { | 396 | { |
418 | sieve_error (mach, | 397 | sieve_error (mach, |
419 | /* TRANSLATORS: 'redirect' is the name of a Sieve action. | 398 | "redirect", |
420 | Do not translate it! */ | 399 | _("%d: cannot create sender address <%s>: %s\n"), |
421 | _("%d: redirect - cannot create sender address <%s>: %s\n"), | ||
422 | sieve_get_message_num (mach), | 400 | sieve_get_message_num (mach), |
423 | fromaddr, mu_strerror (rc)); | 401 | fromaddr, mu_strerror (rc)); |
424 | free (fromaddr); | 402 | free (fromaddr); |
... | @@ -430,7 +408,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -430,7 +408,8 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) |
430 | rc = message_create_copy (&newmsg, msg); | 408 | rc = message_create_copy (&newmsg, msg); |
431 | if (rc) | 409 | if (rc) |
432 | { | 410 | { |
433 | sieve_error (mach, _("%d: cannot copy message: %s"), | 411 | sieve_error (mach, |
412 | _("%d: cannot copy message: %s"), | ||
434 | sieve_get_message_num (mach), | 413 | sieve_get_message_num (mach), |
435 | mu_strerror (rc)); | 414 | mu_strerror (rc)); |
436 | goto end; | 415 | goto end; |
... | @@ -457,9 +436,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -457,9 +436,7 @@ sieve_action_redirect (sieve_machine_t mach, list_t args, list_t tags) |
457 | mailer_get_url (mailer, &url); | 436 | mailer_get_url (mailer, &url); |
458 | 437 | ||
459 | sieve_error (mach, | 438 | sieve_error (mach, |
460 | /* TRANSLATORS: 'redirect' is the name of a Sieve action. | 439 | _("%d: cannot open mailer %s: %s\n"), |
461 | Do not translate it! */ | ||
462 | _("%d: redirect - cannot open mailer %s: %s\n"), | ||
463 | sieve_get_message_num (mach), | 440 | sieve_get_message_num (mach), |
464 | url_to_string (url), | 441 | url_to_string (url), |
465 | mu_strerror (rc)); | 442 | mu_strerror (rc)); | ... | ... |
1 | /* GNU Mailutils -- a suite of utilities for electronic mail | 1 | /* GNU Mailutils -- a suite of utilities for electronic mail |
2 | Copyright (C) 2003 Free Software Foundation, Inc. | 2 | Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
3 | 3 | ||
4 | GNU Mailutils is free software; you can redistribute it and/or modify | 4 | GNU Mailutils is free software; you can redistribute it and/or modify |
5 | it under the terms of the GNU Lesser General Public License as published by | 5 | it under the terms of the GNU Lesser General Public License as published by |
... | @@ -151,13 +151,13 @@ list_test (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -151,13 +151,13 @@ list_test (sieve_machine_t mach, list_t args, list_t tags) |
151 | h = sieve_value_get (args, 0); | 151 | h = sieve_value_get (args, 0); |
152 | if (!h) | 152 | if (!h) |
153 | { | 153 | { |
154 | sieve_error (mach, _("list: can't get argument 1")); | 154 | sieve_arg_error (mach, 1); |
155 | sieve_abort (mach); | 155 | sieve_abort (mach); |
156 | } | 156 | } |
157 | v = sieve_value_get (args, 1); | 157 | v = sieve_value_get (args, 1); |
158 | if (!v) | 158 | if (!v) |
159 | { | 159 | { |
160 | sieve_error (mach, _("list: can't get argument 2")); | 160 | sieve_arg_error (mach, 2); |
161 | sieve_abort (mach); | 161 | sieve_abort (mach); |
162 | } | 162 | } |
163 | 163 | ... | ... |
1 | /* GNU Mailutils -- a suite of utilities for electronic mail | 1 | /* GNU Mailutils -- a suite of utilities for electronic mail |
2 | Copyright (C) 2003 Free Software Foundation, Inc. | 2 | Copyright (C) 2003, 2005 Free Software Foundation, Inc. |
3 | 3 | ||
4 | GNU Mailutils is free software; you can redistribute it and/or modify | 4 | GNU Mailutils is free software; you can redistribute it and/or modify |
5 | it under the terms of the GNU Lesser General Public License as published by | 5 | it under the terms of the GNU Lesser General Public License as published by |
... | @@ -70,20 +70,20 @@ timestamp_test (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -70,20 +70,20 @@ timestamp_test (sieve_machine_t mach, list_t args, list_t tags) |
70 | h = sieve_value_get (args, 0); | 70 | h = sieve_value_get (args, 0); |
71 | if (!h) | 71 | if (!h) |
72 | { | 72 | { |
73 | sieve_error (mach, "timestamp: can't get argument 1"); | 73 | sieve_arg_error (mach, 1); |
74 | sieve_abort (mach); | 74 | sieve_abort (mach); |
75 | } | 75 | } |
76 | /* Second argument: date displacement */ | 76 | /* Second argument: date displacement */ |
77 | v = sieve_value_get (args, 1); | 77 | v = sieve_value_get (args, 1); |
78 | if (!v) | 78 | if (!v) |
79 | { | 79 | { |
80 | sieve_error (mach, "timestamp: can't get argument 2"); | 80 | sieve_arg_error (mach, 2); |
81 | sieve_abort (mach); | 81 | sieve_abort (mach); |
82 | } | 82 | } |
83 | 83 | ||
84 | if (mu_parse_date (v->v.string, &tlimit, &now)) | 84 | if (mu_parse_date (v->v.string, &tlimit, &now)) |
85 | { | 85 | { |
86 | sieve_error (mach, "timestamp: can't parse date specification (%s)", | 86 | sieve_error (mach, _("cannot parse date specification (%s)"), |
87 | v->v.string); | 87 | v->v.string); |
88 | sieve_abort (mach); | 88 | sieve_abort (mach); |
89 | } | 89 | } |
... | @@ -101,7 +101,7 @@ timestamp_test (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -101,7 +101,7 @@ timestamp_test (sieve_machine_t mach, list_t args, list_t tags) |
101 | if (mu_parse_date (val, &tval, &now)) | 101 | if (mu_parse_date (val, &tval, &now)) |
102 | { | 102 | { |
103 | sieve_error (mach, | 103 | sieve_error (mach, |
104 | "timestamp: can't parse header date specification (%s)", | 104 | "cannot parse header date specification (%s)", |
105 | val); | 105 | val); |
106 | free (val); | 106 | free (val); |
107 | sieve_abort (mach); | 107 | sieve_abort (mach); | ... | ... |
... | @@ -162,10 +162,7 @@ regex_comparator (void *item, void *data) | ... | @@ -162,10 +162,7 @@ regex_comparator (void *item, void *data) |
162 | REG_EXTENDED | REG_NOSUB | REG_NEWLINE | REG_ICASE)) | 162 | REG_EXTENDED | REG_NOSUB | REG_NEWLINE | REG_ICASE)) |
163 | { | 163 | { |
164 | sieve_error (d->mach, | 164 | sieve_error (d->mach, |
165 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | 165 | ("%d: cannot compile regular expression \"%s\"\n"), |
166 | Do not translate it! */ | ||
167 | _ | ||
168 | ("%d: vacation - cannot compile regular expression \"%s\"\n"), | ||
169 | sieve_get_message_num (d->mach), | 166 | sieve_get_message_num (d->mach), |
170 | item); | 167 | item); |
171 | return 0; | 168 | return 0; |
... | @@ -256,10 +253,7 @@ check_db (sieve_machine_t mach, list_t tags, char *from) | ... | @@ -256,10 +253,7 @@ check_db (sieve_machine_t mach, list_t tags, char *from) |
256 | 253 | ||
257 | if (asprintf (&file, "%s/.vacation", (home ? home : ".")) == -1) | 254 | if (asprintf (&file, "%s/.vacation", (home ? home : ".")) == -1) |
258 | { | 255 | { |
259 | sieve_error (mach, | 256 | sieve_error (mach, _("%d: cannot build db file name\n"), |
260 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | ||
261 | Do not translate it! */ | ||
262 | _("%d: vacation - cannot build db filename\n"), | ||
263 | sieve_get_message_num (mach)); | 257 | sieve_get_message_num (mach)); |
264 | free (home); | 258 | free (home); |
265 | sieve_abort (mach); | 259 | sieve_abort (mach); |
... | @@ -270,9 +264,7 @@ check_db (sieve_machine_t mach, list_t tags, char *from) | ... | @@ -270,9 +264,7 @@ check_db (sieve_machine_t mach, list_t tags, char *from) |
270 | if (rc) | 264 | if (rc) |
271 | { | 265 | { |
272 | sieve_error (mach, | 266 | sieve_error (mach, |
273 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | 267 | _("%d: cannot open \"%s\": %s"), |
274 | Do not translate it! */ | ||
275 | _("%d: vacation - cannot open \"%s\": %s"), | ||
276 | sieve_get_message_num (mach), file, | 268 | sieve_get_message_num (mach), file, |
277 | mu_strerror (rc)); | 269 | mu_strerror (rc)); |
278 | free (file); | 270 | free (file); |
... | @@ -343,7 +335,7 @@ re_subject (sieve_machine_t mach, list_t tags, char **psubject) | ... | @@ -343,7 +335,7 @@ re_subject (sieve_machine_t mach, list_t tags, char **psubject) |
343 | if (!subject) | 335 | if (!subject) |
344 | { | 336 | { |
345 | sieve_error (mach, | 337 | sieve_error (mach, |
346 | ("%d: vacation - not enough memory"), | 338 | ("%d: not enough memory"), |
347 | sieve_get_message_num (mach)); | 339 | sieve_get_message_num (mach)); |
348 | return; | 340 | return; |
349 | } | 341 | } |
... | @@ -449,10 +441,7 @@ vacation_reply (sieve_machine_t mach, list_t tags, message_t msg, | ... | @@ -449,10 +441,7 @@ vacation_reply (sieve_machine_t mach, list_t tags, message_t msg, |
449 | if (rc) | 441 | if (rc) |
450 | { | 442 | { |
451 | sieve_error (mach, | 443 | sieve_error (mach, |
452 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | 444 | _("%d: cannot create recipient address <%s>: %s\n"), |
453 | Do not translate it! */ | ||
454 | _ | ||
455 | ("%d: vacation - cannot create recipient address <%s>: %s\n"), | ||
456 | sieve_get_message_num (mach), from, mu_strerror (rc)); | 445 | sieve_get_message_num (mach), from, mu_strerror (rc)); |
457 | return -1; | 446 | return -1; |
458 | } | 447 | } |
... | @@ -487,9 +476,7 @@ vacation_reply (sieve_machine_t mach, list_t tags, message_t msg, | ... | @@ -487,9 +476,7 @@ vacation_reply (sieve_machine_t mach, list_t tags, message_t msg, |
487 | mailer_get_url (mailer, &url); | 476 | mailer_get_url (mailer, &url); |
488 | 477 | ||
489 | sieve_error (mach, | 478 | sieve_error (mach, |
490 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | 479 | _("%d: cannot open mailer %s: %s\n"), |
491 | Do not translate it! */ | ||
492 | _("%d: vacation - cannot open mailer %s: %s\n"), | ||
493 | sieve_get_message_num (mach), | 480 | sieve_get_message_num (mach), |
494 | url_to_string (url), mu_strerror (rc)); | 481 | url_to_string (url), mu_strerror (rc)); |
495 | return -1; | 482 | return -1; |
... | @@ -516,10 +503,7 @@ sieve_action_vacation (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -516,10 +503,7 @@ sieve_action_vacation (sieve_machine_t mach, list_t args, list_t tags) |
516 | val = sieve_value_get (args, 0); | 503 | val = sieve_value_get (args, 0); |
517 | if (!val) | 504 | if (!val) |
518 | { | 505 | { |
519 | sieve_error (mach, | 506 | sieve_error (mach, _("cannot get text!")); |
520 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | ||
521 | Do not translate it! */ | ||
522 | _("vacation: cannot get text!")); | ||
523 | sieve_abort (mach); | 507 | sieve_abort (mach); |
524 | } | 508 | } |
525 | else | 509 | else |
... | @@ -536,9 +520,7 @@ sieve_action_vacation (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -536,9 +520,7 @@ sieve_action_vacation (sieve_machine_t mach, list_t args, list_t tags) |
536 | else if (sieve_get_message_sender (msg, &from)) | 520 | else if (sieve_get_message_sender (msg, &from)) |
537 | { | 521 | { |
538 | sieve_error (mach, | 522 | sieve_error (mach, |
539 | /* TRANSLATORS: 'vacation' is the name of a Sieve action. | 523 | _("%d: cannot get sender address\n"), |
540 | Do not translate it! */ | ||
541 | _("%d: vacation - cannot get sender address\n"), | ||
542 | sieve_get_message_num (mach)); | 524 | sieve_get_message_num (mach)); |
543 | sieve_abort (mach); | 525 | sieve_abort (mach); |
544 | } | 526 | } | ... | ... |
... | @@ -127,19 +127,13 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -127,19 +127,13 @@ sieve_test_address (sieve_machine_t mach, list_t args, list_t tags) |
127 | h = sieve_value_get (args, 0); | 127 | h = sieve_value_get (args, 0); |
128 | if (!h) | 128 | if (!h) |
129 | { | 129 | { |
130 | sieve_error (mach, | 130 | sieve_arg_error (mach, 1); |
131 | /* TRANSLATORS: 'address' is the name of a Sieve test. | ||
132 | Do not translate it! */ | ||
133 | _("address: cannot get argument 1")); | ||
134 | sieve_abort (mach); | 131 | sieve_abort (mach); |
135 | } | 132 | } |
136 | v = sieve_value_get (args, 1); | 133 | v = sieve_value_get (args, 1); |
137 | if (!v) | 134 | if (!v) |
138 | { | 135 | { |
139 | sieve_error (mach, | 136 | sieve_arg_error (mach, 2); |
140 | /* TRANSLATORS: 'address' is the name of a Sieve test. | ||
141 | Do not translate it! */ | ||
142 | _("address: cannot get argument 2")); | ||
143 | sieve_abort (mach); | 137 | sieve_abort (mach); |
144 | } | 138 | } |
145 | 139 | ||
... | @@ -199,19 +193,13 @@ sieve_test_header (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -199,19 +193,13 @@ sieve_test_header (sieve_machine_t mach, list_t args, list_t tags) |
199 | h = sieve_value_get (args, 0); | 193 | h = sieve_value_get (args, 0); |
200 | if (!h) | 194 | if (!h) |
201 | { | 195 | { |
202 | sieve_error (mach, | 196 | sieve_arg_error (mach, 1); |
203 | /* TRANSLATORS: 'header' is the name of a Sieve test. | ||
204 | Do not translate it! */ | ||
205 | _("header: cannot get argument 1")); | ||
206 | sieve_abort (mach); | 197 | sieve_abort (mach); |
207 | } | 198 | } |
208 | v = sieve_value_get (args, 1); | 199 | v = sieve_value_get (args, 1); |
209 | if (!v) | 200 | if (!v) |
210 | { | 201 | { |
211 | sieve_error (mach, | 202 | sieve_arg_error (mach, 2); |
212 | /* TRANSLATORS: 'header' is the name of a Sieve test. | ||
213 | Do not translate it! */ | ||
214 | _("header: cannot get argument 2")); | ||
215 | sieve_abort (mach); | 203 | sieve_abort (mach); |
216 | } | 204 | } |
217 | 205 | ||
... | @@ -292,17 +280,13 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -292,17 +280,13 @@ sieve_test_envelope (sieve_machine_t mach, list_t args, list_t tags) |
292 | h = sieve_value_get (args, 0); | 280 | h = sieve_value_get (args, 0); |
293 | if (!h) | 281 | if (!h) |
294 | { | 282 | { |
295 | /* TRANSLATORS: 'header' is the name of a Sieve test. Do not translate it! */ | 283 | sieve_arg_error (mach, 1); |
296 | sieve_error (mach, _("header: cannot get argument 1")); | ||
297 | sieve_abort (mach); | 284 | sieve_abort (mach); |
298 | } | 285 | } |
299 | v = sieve_value_get (args, 1); | 286 | v = sieve_value_get (args, 1); |
300 | if (!v) | 287 | if (!v) |
301 | { | 288 | { |
302 | sieve_error (mach, | 289 | sieve_arg_error (mach, 2); |
303 | /* TRANSLATORS: 'header' is the name of a Sieve test. | ||
304 | Do not translate it! */ | ||
305 | _("header: cannot get argument 2")); | ||
306 | sieve_abort (mach); | 290 | sieve_abort (mach); |
307 | } | 291 | } |
308 | 292 | ||
... | @@ -325,10 +309,7 @@ sieve_test_size (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -325,10 +309,7 @@ sieve_test_size (sieve_machine_t mach, list_t args, list_t tags) |
325 | sieve_value_t *val = sieve_value_get (args, 0); | 309 | sieve_value_t *val = sieve_value_get (args, 0); |
326 | if (!val) | 310 | if (!val) |
327 | { | 311 | { |
328 | sieve_error (mach, | 312 | sieve_arg_error (mach, 1); |
329 | /* TRANSLATORS: 'size' is the name of a Sieve test. | ||
330 | Do not translate it! */ | ||
331 | _("size: cannot get argument!")); | ||
332 | sieve_abort (mach); | 313 | sieve_abort (mach); |
333 | } | 314 | } |
334 | 315 | ||
... | @@ -385,10 +366,7 @@ sieve_test_exists (sieve_machine_t mach, list_t args, list_t tags) | ... | @@ -385,10 +366,7 @@ sieve_test_exists (sieve_machine_t mach, list_t args, list_t tags) |
385 | val = sieve_value_get (args, 0); | 366 | val = sieve_value_get (args, 0); |
386 | if (!val) | 367 | if (!val) |
387 | { | 368 | { |
388 | sieve_error (mach, | 369 | sieve_arg_error (mach, 1); |
389 | /* TRANSLATORS: 'size' is the name of a Sieve test. | ||
390 | Do not translate it! */ | ||
391 | _("exists: cannot get argument!")); | ||
392 | sieve_abort (mach); | 370 | sieve_abort (mach); |
393 | } | 371 | } |
394 | 372 | ... | ... |
-
Please register or sign in to post a comment