diff options
author | Wojciech Polak <polak@gnu.org> | 2005-08-27 11:37:43 +0000 |
---|---|---|
committer | Wojciech Polak <polak@gnu.org> | 2005-08-27 11:37:43 +0000 |
commit | 755146b443774be9fdff992ede4cb921762b9649 (patch) | |
tree | d92ea93eaf520c557231e7dca1d9051eac00d5be /sieve | |
parent | 6178304b1670d7288d8a37b9165bda5cbc44c180 (diff) | |
download | mailutils-755146b443774be9fdff992ede4cb921762b9649.tar.gz mailutils-755146b443774be9fdff992ede4cb921762b9649.tar.bz2 |
Normalize global namespace. Part 2
Diffstat (limited to 'sieve')
-rw-r--r-- | sieve/sieve.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sieve/sieve.c b/sieve/sieve.c index da1142d12..42ad6269d 100644 --- a/sieve/sieve.c +++ b/sieve/sieve.c | |||
@@ -290,12 +290,12 @@ syslog_debug_print (mu_debug_t unused, size_t level, const char *fmt, | |||
290 | 290 | ||
291 | static void | 291 | static void |
292 | stdout_action_log (void *unused, | 292 | stdout_action_log (void *unused, |
293 | const mu_sieve_locus_t *locus, size_t msgno, message_t msg, | 293 | const mu_sieve_locus_t *locus, size_t msgno, mu_message_t msg, |
294 | const char *action, const char *fmt, va_list ap) | 294 | const char *action, const char *fmt, va_list ap) |
295 | { | 295 | { |
296 | size_t uid = 0; | 296 | size_t uid = 0; |
297 | 297 | ||
298 | message_get_uid (msg, &uid); | 298 | mu_message_get_uid (msg, &uid); |
299 | 299 | ||
300 | if (sieve_print_locus) | 300 | if (sieve_print_locus) |
301 | fprintf (stdout, _("%s:%lu: %s on msg uid %lu"), | 301 | fprintf (stdout, _("%s:%lu: %s on msg uid %lu"), |
@@ -314,13 +314,13 @@ stdout_action_log (void *unused, | |||
314 | 314 | ||
315 | static void | 315 | static void |
316 | syslog_action_log (void *unused, | 316 | syslog_action_log (void *unused, |
317 | const mu_sieve_locus_t *locus, size_t msgno, message_t msg, | 317 | const mu_sieve_locus_t *locus, size_t msgno, mu_message_t msg, |
318 | const char *action, const char *fmt, va_list ap) | 318 | const char *action, const char *fmt, va_list ap) |
319 | { | 319 | { |
320 | size_t uid = 0; | 320 | size_t uid = 0; |
321 | char *text = NULL; | 321 | char *text = NULL; |
322 | 322 | ||
323 | message_get_uid (msg, &uid); | 323 | mu_message_get_uid (msg, &uid); |
324 | 324 | ||
325 | if (sieve_print_locus) | 325 | if (sieve_print_locus) |
326 | asprintf (&text, _("%s:%lu: %s on msg uid %lu"), | 326 | asprintf (&text, _("%s:%lu: %s on msg uid %lu"), |
@@ -345,10 +345,10 @@ int | |||
345 | main (int argc, char *argv[]) | 345 | main (int argc, char *argv[]) |
346 | { | 346 | { |
347 | mu_sieve_machine_t mach; | 347 | mu_sieve_machine_t mach; |
348 | wicket_t wicket = 0; | 348 | mu_wicket_t wicket = 0; |
349 | ticket_t ticket = 0; | 349 | mu_ticket_t ticket = 0; |
350 | mu_debug_t debug = 0; | 350 | mu_debug_t debug = 0; |
351 | mailbox_t mbox = 0; | 351 | mu_mailbox_t mbox = 0; |
352 | int rc; | 352 | int rc; |
353 | struct options opts = {0}; | 353 | struct options opts = {0}; |
354 | int (*debugfp) (mu_debug_t, size_t level, const char *, va_list); | 354 | int (*debugfp) (mu_debug_t, size_t level, const char *, va_list); |
@@ -471,8 +471,8 @@ main (int argc, char *argv[]) | |||
471 | 471 | ||
472 | if (ticket) | 472 | if (ticket) |
473 | { | 473 | { |
474 | folder_t folder = NULL; | 474 | mu_folder_t folder = NULL; |
475 | authority_t auth = NULL; | 475 | mu_authority_t auth = NULL; |
476 | 476 | ||
477 | if ((rc = mu_mailbox_get_folder (mbox, &folder))) | 477 | if ((rc = mu_mailbox_get_folder (mbox, &folder))) |
478 | { | 478 | { |