diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-08-26 14:23:32 +0000 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2005-08-26 14:23:32 +0000 |
| commit | 6178304b1670d7288d8a37b9165bda5cbc44c180 (patch) | |
| tree | e17d3bce1e0b2a537937bc331efa240ce382b81e /mimeview | |
| parent | ef22616eba2aaa4e05079852ac1fa67c4ceeff08 (diff) | |
| download | mailutils-6178304b1670d7288d8a37b9165bda5cbc44c180.tar.gz mailutils-6178304b1670d7288d8a37b9165bda5cbc44c180.tar.bz2 | |
Normalize global namespace. Part 1
Diffstat (limited to 'mimeview')
| -rw-r--r-- | mimeview/mimetypes.y | 24 | ||||
| -rw-r--r-- | mimeview/mimeview.c | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/mimeview/mimetypes.y b/mimeview/mimetypes.y index cda0f5d8f..77ad4fc55 100644 --- a/mimeview/mimetypes.y +++ b/mimeview/mimetypes.y @@ -138,15 +138,15 @@ rule_line: /* empty */ { struct rule_tab *p = mimetypes_malloc (sizeof (*p)); if (!rule_list) - list_create (&rule_list); + mu_list_create (&rule_list); p->type = $1.ptr; p->node = $2; - list_append (rule_list, p); + mu_list_append (rule_list, p); } | error eol { if (arg_list) - list_destroy (&arg_list); + mu_list_destroy (&arg_list); arg_list = NULL; reset_lex (); } @@ -207,13 +207,13 @@ function : IDENT_L arglist ')' arglist : arg { - list_create (&arg_list); + mu_list_create (&arg_list); $$ = arg_list; - list_append ($$, mimetypes_string_dup (&$1)); + mu_list_append ($$, mimetypes_string_dup (&$1)); } | arglist ',' arg { - list_append ($1, mimetypes_string_dup (&$3)); + mu_list_append ($1, mimetypes_string_dup (&$3)); $$ = $1; } ; @@ -544,7 +544,7 @@ make_functional_node (char *ident, list_t list) break; } - list_count (list, &count); + mu_list_count (list, &count); i = strlen (p->args); if (count < i) @@ -566,14 +566,14 @@ make_functional_node (char *ident, list_t list) args = mimetypes_malloc (count * sizeof *args); - list_get_iterator (list, &itr); - for (i = 0, iterator_first (itr); !iterator_is_done (itr); - iterator_next (itr), i++) + mu_list_get_iterator (list, &itr); + for (i = 0, mu_iterator_first (itr); !mu_iterator_is_done (itr); + mu_iterator_next (itr), i++) { struct mimetypes_string *data; char *tmp; - iterator_current (itr, (void **)&data); + mu_iterator_current (itr, (void **)&data); switch (p->args[i]) { case 'd': @@ -685,7 +685,7 @@ const char * get_file_type () { const char *type = NULL; - list_do (rule_list, evaluate, &type); + mu_list_do (rule_list, evaluate, &type); return type; } diff --git a/mimeview/mimeview.c b/mimeview/mimeview.c index 7e0df886e..acc26602c 100644 --- a/mimeview/mimeview.c +++ b/mimeview/mimeview.c @@ -197,7 +197,7 @@ display_file (const char *type) if (debug_level) { char *string; - argcv_string (6, argv, &string); + mu_argcv_string (6, argv, &string); printf (_("Executing %s...\n"), string); free (string); } @@ -212,7 +212,7 @@ display_file (const char *type) char *text; asprintf (&text, "Content-Type: %s\n", type); - status = header_create (&hdr, text, strlen (text), NULL); + status = mu_header_create (&hdr, text, strlen (text), NULL); if (status) mu_error (_("Cannot create header: %s"), mu_strerror (status)); else @@ -228,7 +228,7 @@ display_file (const char *type) stream_close (stream); stream_destroy (&stream, stream_get_owner (stream)); - header_destroy (&hdr, header_get_owner (hdr)); + mu_header_destroy (&hdr, mu_header_get_owner (hdr)); } } } |