src/usr.bin/file/magic-dump.c - diff - 1.2

Return to magic-dump.c CVS log

Up to [local] / src / usr.bin / file

Diff for /src/usr.bin/file/magic-dump.c between version 1.1 and 1.2

version 1.1, 2015/04/24 16:24:11

version 1.2, 2016/05/01 10:56:03

Line 31

Line 31

printf("%u", ml->line);

printf("%u", ml->line);

for (i = 0; i < depth; i++)

for (i = 0; i < depth; i++)

printf(">");

printf(">");

printf(" %s/%s%s%s%s [%u]%s\n", ml->type_string,

if (ml->name != NULL)

ml->result == NULL ? "" : ml->result,

printf(" %s %s\n", ml->type_string, ml->name);

ml->mimetype == NULL ? "" : " (",

else {

ml->mimetype == NULL ? "" : ml->mimetype,

printf(" %s/%s%s%s%s [%u]%s\n", ml->type_string,

ml->mimetype == NULL ? "" : ")",

ml->result == NULL ? "" : ml->result,

ml->strength, ml->text ? " (text)" : "");

ml->mimetype == NULL ? "" : " (",

ml->mimetype == NULL ? "" : ml->mimetype,

ml->mimetype == NULL ? "" : ")",

ml->strength, ml->text ? " (text)" : "");

}

TAILQ_FOREACH(child, &ml->children, entry)

TAILQ_FOREACH(child, &ml->children, entry)

magic_dump_line(child, depth + 1);

magic_dump_line(child, depth + 1);

Line 49

Line 53

struct magic_line *ml;

struct magic_line *ml;

RB_FOREACH(ml, magic_tree, &m->tree)

RB_FOREACH(ml, magic_tree, &m->tree)

magic_dump_line(ml, 0);

RB_FOREACH(ml, magic_named_tree, &m->named)

magic_dump_line(ml, 0);

magic_dump_line(ml, 0);

}

}