Rename XSCRIPT_ macros to MU_XSCRIPT.stream-cleanup

18 files changed, 39 insertions, 38 deletions

diff --git a/examples/pop3client.c b/examples/pop3client.c
index 4450f2243..c9246381e 100644
--- a/examples/pop3client.c
+++ b/examples/pop3client.c
@@ -519,9 +519,9 @@ static int
 string_to_xlev (const char *name, int *pv)
 {
   if (strcmp (name, "secure") == 0)
-    *pv = XSCRIPT_SECURE;
+    *pv = MU_XSCRIPT_SECURE;
   else if (strcmp (name, "payload") == 0)
-    *pv = XSCRIPT_PAYLOAD;
+    *pv = MU_XSCRIPT_PAYLOAD;
   else
     return 1;
   return 0;
@@ -568,12 +568,12 @@ set_verbose_mask (mu_pop3_t p)
 {
   if (p)
     {
-      mu_pop3_trace_mask (p, QRY_VERBOSE_MASK (XSCRIPT_SECURE)
+      mu_pop3_trace_mask (p, QRY_VERBOSE_MASK (MU_XSCRIPT_SECURE)
                                   ? MU_POP3_TRACE_SET : MU_POP3_TRACE_CLR,
-                              XSCRIPT_SECURE);
-      mu_pop3_trace_mask (p, QRY_VERBOSE_MASK (XSCRIPT_PAYLOAD)
+                              MU_XSCRIPT_SECURE);
+      mu_pop3_trace_mask (p, QRY_VERBOSE_MASK (MU_XSCRIPT_PAYLOAD)
                                   ? MU_POP3_TRACE_SET : MU_POP3_TRACE_CLR,
-                              XSCRIPT_PAYLOAD);
+                              MU_XSCRIPT_PAYLOAD);
     }
 }
 
@@ -589,12 +589,12 @@ com_verbose (int argc, char **argv)
             {
               char *delim = " (";
             
-              if (QRY_VERBOSE_MASK (XSCRIPT_SECURE))
+              if (QRY_VERBOSE_MASK (MU_XSCRIPT_SECURE))
                 {
                   printf("%ssecure", delim);
                   delim = ", ";
                 }
-              if (QRY_VERBOSE_MASK (XSCRIPT_PAYLOAD))
+              if (QRY_VERBOSE_MASK (MU_XSCRIPT_PAYLOAD))
                 printf("%spayload", delim);
               printf (")");
             }
diff --git a/imap4d/fetch.c b/imap4d/fetch.c
index 8f9339d51..04cf8c6dd 100644
--- a/imap4d/fetch.c
+++ b/imap4d/fetch.c
@@ -1688,7 +1688,7 @@ imap4d_fetch (struct imap4d_command *command, imap4d_tokbuf_t tok)
 {
   int rc;
   char *err_text = "Completed";
-  int xlev = set_xscript_level (XSCRIPT_PAYLOAD);
+  int xlev = set_xscript_level (MU_XSCRIPT_PAYLOAD);
   rc = imap4d_fetch0 (tok, 0, &err_text);
   set_xscript_level (xlev);
   return io_completion_response (command, rc, "%s", err_text);
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 340c2bb15..a5b29e0ed 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -422,7 +422,8 @@ imap4d_mainloop (int fd, FILE *infile, FILE *outfile)
                         RESP_PREAUTH : RESP_OK, "%s", text);
   io_flush ();
 
-  set_xscript_level ((state == STATE_AUTH) ? XSCRIPT_NORMAL : XSCRIPT_SECURE);
+  set_xscript_level ((state == STATE_AUTH) ?
+                      MU_XSCRIPT_NORMAL : MU_XSCRIPT_SECURE);
   
   tokp = imap4d_tokbuf_init ();
   while (1)
diff --git a/imap4d/io.c b/imap4d/io.c
index fcae10707..726cfaa0d 100644
--- a/imap4d/io.c
+++ b/imap4d/io.c
@@ -243,7 +243,7 @@ io_format_completion_response (mu_stream_t str,
   if (new_state != STATE_NONE)
     {
       if (new_state == STATE_AUTH)
-        set_xscript_level (XSCRIPT_NORMAL);
+        set_xscript_level (MU_XSCRIPT_NORMAL);
       state = new_state;
     }
   
@@ -574,7 +574,7 @@ imap4d_readline (struct imap4d_tokbuf *tok)
           char *sp = NULL;
           char *buf;
           size_t len;
-          int xlev = set_xscript_level (XSCRIPT_PAYLOAD);
+          int xlev = set_xscript_level (MU_XSCRIPT_PAYLOAD);
           
           number = strtoul (last_arg + 1, &sp, 10);
           /* Client can ask for non-synchronised literal,
diff --git a/imap4d/uid.c b/imap4d/uid.c
index 9d34b4609..e4e58590b 100644
--- a/imap4d/uid.c
+++ b/imap4d/uid.c
@@ -38,7 +38,7 @@ imap4d_uid (struct imap4d_command *command, imap4d_tokbuf_t tok)
   
   if (mu_c_strcasecmp (cmd, "FETCH") == 0)
     {
-      int xlev = set_xscript_level (XSCRIPT_PAYLOAD);
+      int xlev = set_xscript_level (MU_XSCRIPT_PAYLOAD);
       rc = imap4d_fetch0 (tok, 1, &err_text);
       set_xscript_level (xlev);
     }
diff --git a/imap4d/util.c b/imap4d/util.c
index af081fecc..73d4031df 100644
--- a/imap4d/util.c
+++ b/imap4d/util.c
@@ -677,13 +677,13 @@ set_xscript_level (int xlev)
 {
   if (imap4d_transcript)
     {
-      if (xlev != XSCRIPT_NORMAL)
+      if (xlev != MU_XSCRIPT_NORMAL)
         {
-          mu_log_level_t n = xlev == XSCRIPT_SECURE ?
+          mu_log_level_t n = xlev == MU_XSCRIPT_SECURE ?
                               MU_DEBUG_TRACE6 : MU_DEBUG_TRACE7;
           
           if (mu_global_debug_level ("imap4") & MU_DEBUG_LEVEL_MASK (n))
-            return XSCRIPT_NORMAL;
+            return MU_XSCRIPT_NORMAL;
         }
 
       if (mu_stream_ioctl (iostream, MU_IOCTL_LEVEL, &xlev) == 0)
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h
index ab1d9c4d7..0d506025c 100644
--- a/include/mailutils/stream.h
+++ b/include/mailutils/stream.h
@@ -157,9 +157,9 @@ int mu_tcp_stream_create (mu_stream_t *stream, const char *host, int port,
                           int flags);
 
 /* Transcript output levels */
-#define XSCRIPT_NORMAL  0  /* Normal transcript */
-#define XSCRIPT_SECURE  1  /* Security-related data are being sent/received */
-#define XSCRIPT_PAYLOAD 2  /* Actual payload (may be copious) */
+#define MU_XSCRIPT_NORMAL  0  /* Normal transcript */
+#define MU_XSCRIPT_SECURE  1  /* Security-related data are being transmitted */
+#define MU_XSCRIPT_PAYLOAD 2  /* Actual payload (may be copious) */
 
 int mu_xscript_stream_create(mu_stream_t *pref, mu_stream_t transport,
                              mu_stream_t logstr,
diff --git a/libproto/pop/mbox.c b/libproto/pop/mbox.c
index 68e2d93db..f5132957c 100644
--- a/libproto/pop/mbox.c
+++ b/libproto/pop/mbox.c
@@ -162,9 +162,9 @@ pop_open (mu_mailbox_t mbox, int flags)
   if (mu_debug_check_level (mbox->debug, MU_DEBUG_PROT))
     mu_pop3_trace (mpd->pop3, MU_POP3_TRACE_SET);
   if (mu_debug_check_level (mbox->debug, MU_DEBUG_TRACE6))
-    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, XSCRIPT_SECURE);
+    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, MU_XSCRIPT_SECURE);
   if (mu_debug_check_level (mbox->debug, MU_DEBUG_TRACE7))
-    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, XSCRIPT_PAYLOAD);
+    mu_pop3_trace_mask (mpd->pop3, MU_POP3_TRACE_SET, MU_XSCRIPT_PAYLOAD);
     
   do
     {
diff --git a/libproto/pop/pop3_pass.c b/libproto/pop/pop3_pass.c
index 30f823f96..d72c511f2 100644
--- a/libproto/pop/pop3_pass.c
+++ b/libproto/pop/pop3_pass.c
@@ -35,10 +35,10 @@ mu_pop3_pass (mu_pop3_t pop3, const char *passwd)
   switch (pop3->state)
     {
     case MU_POP3_NO_STATE:
-      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, XSCRIPT_SECURE))
-        _mu_pop3_xscript_level (pop3, XSCRIPT_SECURE);
+      if (mu_pop3_trace_mask (pop3, MU_POP3_TRACE_QRY, MU_XSCRIPT_SECURE))
+        _mu_pop3_xscript_level (pop3, MU_XSCRIPT_SECURE);
       status = mu_pop3_writeline (pop3, "PASS %s\r\n", passwd);
-      _mu_pop3_xscript_level (pop3, XSCRIPT_NORMAL);
+      _mu_pop3_xscript_level (pop3, MU_XSCRIPT_NORMAL);
       MU_POP3_CHECK_ERROR (pop3, status);
       /* FIXME: how to obscure the passwd in the stream buffer? */
       MU_POP3_FCLR (pop3, MU_POP3_ACK);
diff --git a/libproto/pop/pop3_retr.c b/libproto/pop/pop3_retr.c
index fc454da93..aca24da65 100644
--- a/libproto/pop/pop3_retr.c
+++ b/libproto/pop/pop3_retr.c