Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 218bf08a 218bf08a7bb4c9ffb9762d165ac434b316ce14d8 by Sergey Poznyakoff
Options

Minor stylistic changes

1 parent 17a229a4
Inline Side-by-side
Showing 4 changed files with 23 additions and 19 deletions
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2005,
3 2006 Free Software Foundation, Inc.
3 4
4 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
5 modify it under the terms of the GNU Lesser General Public 6 modify it under the terms of the GNU Lesser General Public
...@@ -64,15 +65,16 @@ sieve_action_fileinto (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags) ...@@ -64,15 +65,16 @@ sieve_action_fileinto (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags)
64 mu_sieve_error (mach, _("cannot get filename!")); 65 mu_sieve_error (mach, _("cannot get filename!"));
65 mu_sieve_abort (mach); 66 mu_sieve_abort (mach);
66 } 67 }
67 mu_sieve_log_action (mach, "FILEINTO", _("delivering into %s"), val->v.string); 68 mu_sieve_log_action (mach, "FILEINTO",
69 _("delivering into %s"), val->v.string);
68 if (mu_sieve_is_dry_run (mach)) 70 if (mu_sieve_is_dry_run (mach))
69 return 0; 71 return 0;
70 72
71 rc = mu_message_save_to_mailbox (mach->msg, mach->ticket, mach->debug, 73 rc = mu_message_save_to_mailbox (mach->msg, mach->ticket, mach->debug,
72 val->v.string); 74 val->v.string);
73 if (rc) 75 if (rc)
74 mu_sieve_error (mach, _("cannot save to mailbox: %s"), 76 mu_sieve_error (mach, _("cannot save to mailbox: %s"),
75 mu_strerror (rc)); 77 mu_strerror (rc));
76 else 78 else
77 sieve_mark_deleted (mach->msg, 1); 79 sieve_mark_deleted (mach->msg, 1);
78 80
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002, 2004, 2 Copyright (C) 1999, 2000, 2001, 2002, 2004,
3 2005 Free Software Foundation, Inc. 3 2005, 2006 Free Software Foundation, Inc.
4 4
5 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
6 modify it under the terms of the GNU Lesser General Public 6 modify it under the terms of the GNU Lesser General Public
...@@ -37,12 +37,13 @@ mu_sieve_require (mu_list_t slist) ...@@ -37,12 +37,13 @@ mu_sieve_require (mu_list_t slist)
37 if (status) 37 if (status)
38 { 38 {
39 sieve_compile_error (sieve_filename, sieve_line_num, 39 sieve_compile_error (sieve_filename, sieve_line_num,
40 _("cannot create iterator: %s"), 40 _("cannot create iterator: %s"),
41 mu_strerror (status)); 41 mu_strerror (status));
42 return; 42 return;
43 } 43 }
44 44
45 for (mu_iterator_first (itr); !mu_iterator_is_done (itr); mu_iterator_next (itr)) 45 for (mu_iterator_first (itr);
46 !mu_iterator_is_done (itr); mu_iterator_next (itr))
46 { 47 {
47 char *name; 48 char *name;
48 int (*reqfn) (mu_sieve_machine_t mach, const char *name) = NULL; 49 int (*reqfn) (mu_sieve_machine_t mach, const char *name) = NULL;
......
...@@ -49,22 +49,22 @@ struct sieve_machine { ...@@ -49,22 +49,22 @@ struct sieve_machine {
49 mu_list_t comp_list; /* Comparators */ 49 mu_list_t comp_list; /* Comparators */
50 mu_list_t source_list; /* Source names (for diagnostics) */ 50 mu_list_t source_list; /* Source names (for diagnostics) */
51 51
52 size_t progsize; /* Number of allocated program cells */ 52 size_t progsize; /* Number of allocated program cells */
53 sieve_op_t *prog; /* Compiled program */ 53 sieve_op_t *prog; /* Compiled program */
54 54
55 /* Runtime data */ 55 /* Runtime data */
56 size_t pc; /* Current program counter */ 56 size_t pc; /* Current program counter */
57 long reg; /* Numeric register */ 57 long reg; /* Numeric register */
58 mu_list_t stack; /* Runtime stack */ 58 mu_list_t stack; /* Runtime stack */
59 59
60 int debug_level; /* Debugging level */ 60 int debug_level; /* Debugging level */
61 jmp_buf errbuf; /* Target location for non-local exits */ 61 jmp_buf errbuf; /* Target location for non-local exits */
62 char *identifier; /* Name of action or test being executed */ 62 char *identifier; /* Name of action or test being executed */
63 63
64 mu_mailbox_t mailbox; /* Mailbox to operate upon */ 64 mu_mailbox_t mailbox; /* Mailbox to operate upon */
65 size_t msgno; /* Current message number */ 65 size_t msgno; /* Current message number */
66 mu_message_t msg; /* Current message */ 66 mu_message_t msg; /* Current message */
67 int action_count; /* Number of actions executed over this message */ 67 int action_count; /* Number of actions executed over this message */
68 68
69 /* User supplied data */ 69 /* User supplied data */
70 mu_sieve_parse_error_t parse_error_printer; 70 mu_sieve_parse_error_t parse_error_printer;
......
1 /* GNU Mailutils -- a suite of utilities for electronic mail 1 /* GNU Mailutils -- a suite of utilities for electronic mail
2 Copyright (C) 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc. 2 Copyright (C) 1999, 2000, 2001, 2002, 2005,
3 2006 Free Software Foundation, Inc.
3 4
4 This library is free software; you can redistribute it and/or 5 This library is free software; you can redistribute it and/or
5 modify it under the terms of the GNU Lesser General Public 6 modify it under the terms of the GNU Lesser General Public
...@@ -253,7 +254,7 @@ mu_sieve_debug (mu_sieve_machine_t mach, const char *fmt, ...) ...@@ -253,7 +254,7 @@ mu_sieve_debug (mu_sieve_machine_t mach, const char *fmt, ...)
253 254
254 void 255 void
255 mu_sieve_log_action (mu_sieve_machine_t mach, const char *action, 256 mu_sieve_log_action (mu_sieve_machine_t mach, const char *action,
256 const char *fmt, ...) 257 const char *fmt, ...)
257 { 258 {
258 va_list ap; 259 va_list ap;
259 260
......