src/usr.bin/file/magic.h - diff

Return to magic.h CVS log

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

Diff for /src/usr.bin/file/magic.h between version 1.13 and 1.14

version 1.13, 2016/05/01 08:48:39

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

Line 96

MAGIC_TYPE_SEARCH,

MAGIC_TYPE_DEFAULT,

MAGIC_TYPE_CLEAR,

MAGIC_TYPE_NAME,

MAGIC_TYPE_USE,

};

TAILQ_HEAD(magic_lines, magic_line);

RB_HEAD(magic_tree, magic_line);

RB_HEAD(magic_named_tree, magic_line);

struct magic_line {

struct magic *root;

Line 121

Line 124

char indirect_operator;

int64_t indirect_operand;

const char *name;

enum magic_type type;

const char *type_string;

char type_operator;

Line 148

Line 153

int warnings;

struct magic_tree tree;

struct magic_named_tree named;

int compiled;

regex_t format_short;

Line 166

Line 172

size_t size;

size_t offset;

int matched;

size_t start;

int reverse;

};

#define MAGIC_TEST_TEXT 0x1

Line 173

Line 182

int magic_compare(struct magic_line *, struct magic_line *);

RB_PROTOTYPE(magic_tree, magic_line, node, magic_compare);

int magic_named_compare(struct magic_line *, struct magic_line *);

RB_PROTOTYPE(magic_named_tree, magic_line, node, magic_named_compare);

char *magic_strtoull(const char *, uint64_t *);

char *magic_strtoll(const char *, int64_t *);