aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

MIME: Re-arrange

Browse Source 
Let get_mime_type_name return an option instead of a name, and rename
it to get_mime_type_option.
This commit is contained in:
Miciah Dashiel Butler Masters 2006-05-05 20:58:30 +00:00 committed by Miciah Dashiel Butler Masters
parent 680a1c735b
commit 9bc5317b13
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mime/backend/default.c
View File

@ -143,8 +143,8 @@ get_content_type_default(unsigned char *extension)
return NULL; return NULL;
} }
static unsigned char * static struct option *
get_mime_type_name(unsigned char *type) get_mime_type_option(unsigned char *type)
{ {
struct string name; struct string name;
int oldlength; int oldlength;
@ -159,8 +159,13 @@ get_mime_type_name(unsigned char *type)
/* Search for end of the base type. */ /* Search for end of the base type. */
pos = strchr(pos, '/'); pos = strchr(pos, '/');
if (pos) { if (pos) {
struct option *opt;
*pos = '.'; *pos = '.';
return name.source; opt = get_opt_rec_real(config_options, name.source);
done_string(&name);
return opt;
} }
} }
@ -171,13 +176,9 @@ get_mime_type_name(unsigned char *type)
static inline struct option * static inline struct option *
get_mime_handler_option(unsigned char *type, int xwin) get_mime_handler_option(unsigned char *type, int xwin)
{ {
struct option *opt; struct option *opt = get_mime_type_option(type);
unsigned char *name = get_mime_type_name(type); unsigned char *name;
if (!name) return NULL;
opt = get_opt_rec_real(config_options, name);
mem_free(name);
if (!opt) return NULL; if (!opt) return NULL;
name = straconcat("mime.handler.", opt->value.string, name = straconcat("mime.handler.", opt->value.string,
@ -197,17 +198,10 @@ get_mime_handler_default(unsigned char *type, int have_x)
if (opt_tree) { if (opt_tree) {
unsigned char *desc = ""; unsigned char *desc = "";
unsigned char *mt = get_mime_type_name(type); struct option *opt = get_mime_type_option(type);
/* Try to find some description to assing to @name */ /* Try to find some description to assing to @name */
if (mt) {
struct option *opt;
opt = get_opt_rec_real(config_options, mt);
mem_free(mt);
if (opt) desc = opt->value.string; if (opt) desc = opt->value.string;
}
return init_mime_handler(get_opt_str_tree(opt_tree, "program"), return init_mime_handler(get_opt_str_tree(opt_tree, "program"),
desc, default_mime_module.name, desc, default_mime_module.name,