summaryrefslogtreecommitdiff
path: root/libsieve/require.c
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2005-08-26 14:23:32 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2005-08-26 14:23:32 +0000
commit6178304b1670d7288d8a37b9165bda5cbc44c180 (patch)
treee17d3bce1e0b2a537937bc331efa240ce382b81e /libsieve/require.c
parentef22616eba2aaa4e05079852ac1fa67c4ceeff08 (diff)
downloadmailutils-6178304b1670d7288d8a37b9165bda5cbc44c180.tar.gz
mailutils-6178304b1670d7288d8a37b9165bda5cbc44c180.tar.bz2
Normalize global namespace. Part 1
Diffstat (limited to 'libsieve/require.c')
-rw-r--r--libsieve/require.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/libsieve/require.c b/libsieve/require.c
index 0bf616511..6d2b754d2 100644
--- a/libsieve/require.c
+++ b/libsieve/require.c
@@ -1,5 +1,6 @@
/* GNU Mailutils -- a suite of utilities for electronic mail
- Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004,
+ 2005 Free Software Foundation, Inc.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -27,12 +28,12 @@
#include <sieve.h>
void
-sieve_require (list_t slist)
+mu_sieve_require (list_t slist)
{
int status;
iterator_t itr;
- status = list_get_iterator (slist, &itr);
+ status = mu_list_get_iterator (slist, &itr);
if (status)
{
sieve_compile_error (sieve_filename, sieve_line_num,
@@ -41,34 +42,34 @@ sieve_require (list_t slist)
return;
}
- for (iterator_first (itr); !iterator_is_done (itr); iterator_next (itr))
+ for (mu_iterator_first (itr); !mu_iterator_is_done (itr); mu_iterator_next (itr))
{
char *name;
- int (*reqfn) __PMT ((sieve_machine_t mach, const char *name)) = NULL;
+ int (*reqfn) (mu_sieve_machine_t mach, const char *name) = NULL;
char *text = NULL;
- iterator_current (itr, (void **)&name);
+ mu_iterator_current (itr, (void **)&name);
if (strncmp (name, "comparator-", 11) == 0)
{
name += 11;
- reqfn = sieve_require_comparator;
+ reqfn = mu_sieve_require_comparator;
text = _("required comparator");
}
else if (strncmp (name, "test-", 5) == 0) /* GNU extension */
{
name += 5;
- reqfn = sieve_require_test;
+ reqfn = mu_sieve_require_test;
text = _("required test");
}
else if (strcmp (name, "relational") == 0) /* RFC 3431 */
{
- reqfn = sieve_require_relational;
+ reqfn = mu_sieve_require_relational;
text = "";
}
else
{
- reqfn = sieve_require_action;
+ reqfn = mu_sieve_require_action;
text = _("required action");
}
@@ -80,6 +81,6 @@ sieve_require (list_t slist)
name);
}
}
- iterator_destroy (&itr);
+ mu_iterator_destroy (&itr);
}

Return to:

Send suggestions and report system problems to the System administrator.