Normalize global namespace. Part 2

2 files changed, 12 insertions, 12 deletions

diff --git a/mimeview/mimetypes.y b/mimeview/mimetypes.y
index 77ad4fc55..14a8782fe 100644
--- a/mimeview/mimetypes.y
+++ b/mimeview/mimetypes.y
@@ -44,7 +44,7 @@ yyprint (FILE *output, unsigned short toknum, YYSTYPE val)
 
 #define YYPRINT yyprint
 
-static list_t arg_list; /* For error recovery */
+static mu_list_t arg_list; /* For error recovery */
 
 #define L_OR  0
 #define L_AND 1
@@ -92,7 +92,7 @@ static struct node *make_binary_node (int op,
 static struct node *make_negation_node (struct node *p);
 
 static struct node *make_suffix_node (struct mimetypes_string *suffix);
-static struct node *make_functional_node (char *ident, list_t list);
+static struct node *make_functional_node (char *ident, mu_list_t list);
 
 static int eval_rule (struct node *root);
 
@@ -102,7 +102,7 @@ struct rule_tab
   struct node *node;
 };
 
-static list_t rule_list;
+static mu_list_t rule_list;
 
 %}
 
@@ -119,7 +119,7 @@ static list_t rule_list;
 
 %union {
   struct mimetypes_string string;
-  list_t list;
+  mu_list_t list;
   int result;
   struct node *node;
 }
@@ -521,13 +521,13 @@ static struct builtin_tab builtin_tab[] = {
 };
   
 struct node *
-make_functional_node (char *ident, list_t list)
+make_functional_node (char *ident, mu_list_t list)
 {
   size_t count, i;
   struct builtin_tab *p;
   struct node *node;
   union argument *args;
-  iterator_t itr;
+  mu_iterator_t itr;
   
   for (p = builtin_tab; ; p++)
     {
diff --git a/mimeview/mimeview.c b/mimeview/mimeview.c
index acc26602c..765125ee1 100644
--- a/mimeview/mimeview.c
+++ b/mimeview/mimeview.c
@@ -207,8 +207,8 @@ display_file (const char *type)
     }
   else
     {
-      stream_t stream;
-      header_t hdr;
+      mu_stream_t stream;
+      mu_header_t hdr;
       char *text;
 
       asprintf (&text, "Content-Type: %s\n", type);
@@ -217,16 +217,16 @@ display_file (const char *type)
 	mu_error (_("Cannot create header: %s"), mu_strerror (status));
       else
 	{
-	  stdio_stream_create (&stream, mimeview_fp,
+	  mu_stdio_stream_create (&stream, mimeview_fp,
 			       MU_STREAM_READ|MU_STREAM_SEEKABLE|MU_STREAM_NO_CLOSE);
-	  stream_open (stream);
+	  mu_stream_open (stream);
 	  
 	  display_stream_mailcap (mimeview_file, stream, hdr,
 				  no_ask_types, interactive, dry_run,
 				  debug_level);
 	  
-	  stream_close (stream);
-	  stream_destroy (&stream, stream_get_owner (stream));
+	  mu_stream_close (stream);
+	  mu_stream_destroy (&stream, mu_stream_get_owner (stream));
 
 	  mu_header_destroy (&hdr, mu_header_get_owner (hdr));
 	}