Normalize global namespace. Part 1

3 files changed, 18 insertions, 18 deletions

diff --git a/comsat/action.c b/comsat/action.c
index 71e91572e..f972800d4 100644
--- a/comsat/action.c
+++ b/comsat/action.c
@@ -123,7 +123,7 @@ expand_escape (char **pp, message_t msg, struct obstack *stk)
       memcpy (namep, start, len);
       namep[len] = 0;
       if (message_get_header (msg, &hdr) == 0
-	  && header_aget_value (hdr, namep, &sval) == 0)
+	  && mu_header_aget_value (hdr, namep, &sval) == 0)
 	{
 	  len = strlen (sval);
 	  obstack_grow (stk, sval, len);
@@ -148,7 +148,7 @@ expand_escape (char **pp, message_t msg, struct obstack *stk)
       if (lncount == 0)
 	lncount = maxlines;
       if (message_get_body (msg, &body) == 0
-	  && body_get_stream (body, &stream) == 0)
+	  && mu_body_get_stream (body, &stream) == 0)
 	{
 	  size_t nread;
 	  char *buf = malloc (size+1);
@@ -198,7 +198,7 @@ expand_line (const char *str, message_t msg)
 	  p++;
 	  if (*p)
 	    {
-	      c = argcv_unquote_char (*p);
+	      c = mu_argcv_unquote_char (*p);
 	      obstack_1grow (&stk, c);
 	    }
 	  break;
@@ -353,12 +353,12 @@ run_user_action (FILE *tty, const char *cr, message_t msg)
 	  str = expand_line (stmt, msg);
 	  if (!str)
 	    continue;
-	  if (argcv_get (str, "", NULL, &argc, &argv)
+	  if (mu_argcv_get (str, "", NULL, &argc, &argv)
 	      || argc == 0
 	      || argv[0][0] == '#')
 	    {
 	      free (str);
-	      argcv_free (argc, argv);
+	      mu_argcv_free (argc, argv);
 	      continue;
 	    }
 
diff --git a/comsat/cfg.c b/comsat/cfg.c
index d849f01ac..e04191de0 100644
--- a/comsat/cfg.c
+++ b/comsat/cfg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2001, 2002, 2005 Free Software Foundation, Inc.
 
    This file is part of GNU Inetutils.
 
@@ -160,11 +160,11 @@ read_config (const char *config_file)
       if (!*ptr || *ptr == '#')
 	continue;
 
-      argcv_get (ptr, "", NULL, &argc, &argv);
+      mu_argcv_get (ptr, "", NULL, &argc, &argv);
       if (argc < 2)
 	{
 	  syslog (LOG_ERR, _("%s:%d: too few fields"), config_file, line);
-	  argcv_free (argc, argv);
+	  mu_argcv_free (argc, argv);
 	  continue;
 	}
 
@@ -196,7 +196,7 @@ read_config (const char *config_file)
 	  else
 	    {
 	      syslog (LOG_ERR, _("%s:%d: unknown keyword"), config_file, line);
-	      argcv_free (argc, argv);
+	      mu_argcv_free (argc, argv);
 	      continue;
 	    }
 
@@ -217,7 +217,7 @@ read_config (const char *config_file)
 	      tail = cur;
 	    }
 
-	  argcv_free (argc, argv);
+	  mu_argcv_free (argc, argv);
 
 	  acl = malloc (sizeof *acl);
 	  if (!acl)
diff --git a/comsat/comsat.c b/comsat/comsat.c
index d70ef66e0..a73574a1d 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -450,15 +450,15 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
 	return;
     }
 
-  if ((status = mailbox_create (&mbox, path)) != 0
-      || (status = mailbox_open (mbox, MU_STREAM_READ)) != 0)
+  if ((status = mu_mailbox_create (&mbox, path)) != 0
+      || (status = mu_mailbox_open (mbox, MU_STREAM_READ)) != 0)
     {
       syslog (LOG_ERR, _("Cannot open mailbox %s: %s"),
 	      path, mu_strerror (status));
       return;
     }
 
-  if ((status = mailbox_get_stream (mbox, &stream)))
+  if ((status = mu_mailbox_get_stream (mbox, &stream)))
     {
       syslog (LOG_ERR, _("Cannot get stream for mailbox %s: %s"),
 	      path, mu_strerror (status));
@@ -481,8 +481,8 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
   stream_read (stream, blurb, size, offset, &n);
   blurb[size] = 0;
 
-  if ((status = mailbox_create (&tmp, "/dev/null")) != 0
-      || (status = mailbox_open (tmp, MU_STREAM_READ)) != 0)
+  if ((status = mu_mailbox_create (&tmp, "/dev/null")) != 0
+      || (status = mu_mailbox_open (tmp, MU_STREAM_READ)) != 0)
     {
       syslog (LOG_ERR, _("Cannot create temporary mailbox: %s"),
 	      mu_strerror (status));
@@ -497,9 +497,9 @@ notify_user (const char *user, const char *device, const char *path, off_t offse
     }
 
   stream_write (stream, blurb, size, 0, &count);
-  mailbox_set_stream (tmp, stream);
-  mailbox_messages_count (tmp, &count);
-  mailbox_get_message (tmp, 1, &msg);
+  mu_mailbox_set_stream (tmp, stream);
+  mu_mailbox_messages_count (tmp, &count);
+  mu_mailbox_get_message (tmp, 1, &msg);
 
   run_user_action (fp, cr, msg);
   fclose (fp);