Normalize global namespace. Part 1

1 files changed, 36 insertions, 35 deletions

diff --git a/sieve/sieve.c b/sieve/sieve.c
index c0cdff580..da1142d12 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -1,3 +1,4 @@
 /* GNU Mailutils -- a suite of utilities for electronic mail
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 
+   2005 Free Software Foundation, Inc.
 
@@ -195,3 +196,3 @@ parser (int key, char *arg, struct argp_state *state)
 	    case 'g':
-	      sieve_yydebug = 1;
+	      mu_sieve_yydebug = 1;
 	      break;
@@ -291,3 +292,3 @@ static void
 stdout_action_log (void *unused,
-		   const sieve_locus_t *locus, size_t msgno, message_t msg,
+		   const mu_sieve_locus_t *locus, size_t msgno, message_t msg,
 		   const char *action, const char *fmt, va_list ap)
@@ -315,3 +316,3 @@ static void
 syslog_action_log (void *unused,
-		   const sieve_locus_t *locus, size_t msgno, message_t msg,
+		   const mu_sieve_locus_t *locus, size_t msgno, message_t msg,
 		   const char *action, const char *fmt, va_list ap)
@@ -345,3 +346,3 @@ main (int argc, char *argv[])
 {
-  sieve_machine_t mach;
+  mu_sieve_machine_t mach;
   wicket_t wicket = 0;
@@ -361,3 +362,3 @@ main (int argc, char *argv[])
 #endif
-  sieve_argp_init ();
+  mu_sieve_argp_init ();
   rc = mu_argp_parse (&argp, &argc, &argv, ARGP_IN_ORDER, sieve_argp_capa,
@@ -371,3 +372,3 @@ main (int argc, char *argv[])
   /* Sieve interpreter setup. */
-  rc = sieve_machine_init (&mach, NULL);
+  rc = mu_sieve_machine_init (&mach, NULL);
   if (rc)
@@ -382,5 +383,5 @@ main (int argc, char *argv[])
       mu_error_set_print (mu_syslog_error_printer);
-      sieve_set_debug (mach, sieve_syslog_debug_printer);
+      mu_sieve_set_debug (mach, sieve_syslog_debug_printer);
       if (opts.verbose)
-	sieve_set_logger (mach, syslog_action_log);
+	mu_sieve_set_logger (mach, syslog_action_log);
       debugfp = syslog_debug_print;
@@ -389,5 +390,5 @@ main (int argc, char *argv[])
     {
-      sieve_set_debug (mach, sieve_stderr_debug_printer);
+      mu_sieve_set_debug (mach, sieve_stderr_debug_printer);
       if (opts.verbose)
-	sieve_set_logger (mach, stdout_action_log);
+	mu_sieve_set_logger (mach, stdout_action_log);
       debugfp = stderr_debug_print;
@@ -395,3 +396,3 @@ main (int argc, char *argv[])
   
-  rc = sieve_compile (mach, opts.script);
+  rc = mu_sieve_compile (mach, opts.script);
   if (rc)
@@ -403,3 +404,3 @@ main (int argc, char *argv[])
       if (opts.compile_only == 2)
-	sieve_disass (mach);
+	mu_sieve_disass (mach);
       return 0;
@@ -410,5 +411,5 @@ main (int argc, char *argv[])
     {
-      if ((rc = wicket_create (&wicket, opts.tickets)) == 0)
+      if ((rc = mu_wicket_create (&wicket, opts.tickets)) == 0)
         {
-          if ((rc = wicket_get_ticket (wicket, &ticket, 0, 0)) != 0)
+          if ((rc = mu_wicket_get_ticket (wicket, &ticket, 0, 0)) != 0)
             {
@@ -420,3 +421,3 @@ main (int argc, char *argv[])
         {
-          mu_error (_("wicket_create `%s' failed: %s"),
+          mu_error (_("mu_wicket_create `%s' failed: %s"),
                     opts.tickets, mu_strerror (rc));
@@ -425,3 +426,3 @@ main (int argc, char *argv[])
       if (ticket)
-        sieve_set_ticket (mach, ticket);
+        mu_sieve_set_ticket (mach, ticket);
     }
@@ -450,6 +451,6 @@ main (int argc, char *argv[])
   
-  sieve_set_debug_level (mach, debug, opts.sieve_debug);
+  mu_sieve_set_debug_level (mach, debug, opts.sieve_debug);
     
   /* Create, give a ticket to, and open the mailbox. */
-  if ((rc = mailbox_create_default (&mbox, opts.mbox)) != 0)
+  if ((rc = mu_mailbox_create_default (&mbox, opts.mbox)) != 0)
     {
@@ -464,5 +465,5 @@ main (int argc, char *argv[])
 
-  if (debug && (rc = mailbox_set_debug (mbox, debug)))
+  if (debug && (rc = mu_mailbox_set_debug (mbox, debug)))
     {
-      mu_error (_("mailbox_set_debug failed: %s"), mu_strerror (rc));
+      mu_error (_("mu_mailbox_set_debug failed: %s"), mu_strerror (rc));
       goto cleanup;
@@ -475,5 +476,5 @@ main (int argc, char *argv[])
 
-      if ((rc = mailbox_get_folder (mbox, &folder)))
+      if ((rc = mu_mailbox_get_folder (mbox, &folder)))
 	{
-	  mu_error (_("mailbox_get_folder failed: %s"),
+	  mu_error (_("mu_mailbox_get_folder failed: %s"),
 		   mu_strerror (rc));
@@ -482,5 +483,5 @@ main (int argc, char *argv[])
 
-      if ((rc = folder_get_authority (folder, &auth)))
+      if ((rc = mu_folder_get_authority (folder, &auth)))
 	{
-	  mu_error (_("folder_get_authority failed: %s"),
+	  mu_error (_("mu_folder_get_authority failed: %s"),
 		   mu_strerror (rc));
@@ -490,5 +491,5 @@ main (int argc, char *argv[])
       /* Authentication-less folders don't have authorities. */
-      if (auth && (rc = authority_set_ticket (auth, ticket)))
+      if (auth && (rc = mu_authority_set_ticket (auth, ticket)))
 	{
-	  mu_error (_("authority_set_ticket failed: %s"),
+	  mu_error (_("mu_authority_set_ticket failed: %s"),
 		   mu_strerror (rc));
@@ -500,5 +501,5 @@ main (int argc, char *argv[])
   if (opts.sieve_debug & MU_SIEVE_DRY_RUN)
-    rc = mailbox_open (mbox, MU_STREAM_READ);
+    rc = mu_mailbox_open (mbox, MU_STREAM_READ);
   else
-    rc = mailbox_open (mbox, MU_STREAM_RDWR);
+    rc = mu_mailbox_open (mbox, MU_STREAM_RDWR);
 
@@ -512,3 +513,3 @@ main (int argc, char *argv[])
 		  mu_strerror (rc));
-      mailbox_destroy (&mbox);
+      mu_mailbox_destroy (&mbox);
       goto cleanup;
@@ -517,3 +518,3 @@ main (int argc, char *argv[])
   /* Process the mailbox */
-  rc = sieve_mailbox (mach, mbox);
+  rc = mu_sieve_mailbox (mach, mbox);
 
@@ -528,3 +529,3 @@ cleanup:
          on a later message. */
-      if ((e = mailbox_expunge (mbox)) != 0)
+      if ((e = mu_mailbox_expunge (mbox)) != 0)
 	{
@@ -542,5 +543,5 @@ cleanup:
 
-  sieve_machine_destroy (&mach);
-  mailbox_close (mbox);
-  mailbox_destroy (&mbox);
+  mu_sieve_machine_destroy (&mach);
+  mu_mailbox_close (mbox);
+  mu_mailbox_destroy (&mbox);
   mu_debug_destroy (&debug, mach);