X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fformat.h;h=470c45cbf7117308702130afca56223a034098a2;hb=25fae0555073f526e5d5825133a2f62454a7b4c6;hp=375b639f762c891184833556a78ef3ca3be12202;hpb=37597beca4a11edba50b847932fdfeca3a648fa2;p=pspp diff --git a/src/format.h b/src/format.h index 375b639f76..470c45cbf7 100644 --- a/src/format.h +++ b/src/format.h @@ -21,6 +21,9 @@ #define format_h 1 /* Display format types. */ + +#include "bool.h" + /* See the definitions of these functions and variables when modifying this list: misc.c:convert_fmt_ItoO() @@ -73,14 +76,23 @@ extern struct fmt_desc formats[]; union value; -/* Maximum length of formatted value, in character. */ +/* Maximum length of formatted value, in characters. */ #define MAX_FORMATTED_LEN 256 -int parse_format_specifier (struct fmt_spec *input, int allow_xt); -int parse_format_specifier_name (const char **cp, int allow_xt); -int check_input_specifier (const struct fmt_spec *spec); -int check_output_specifier (const struct fmt_spec *spec); -int check_string_specifier (const struct fmt_spec *spec, int min_len); +/* Flags for parsing formats. */ +enum fmt_parse_flags + { + FMTP_ALLOW_XT = 001, /* 1=Allow X and T formats. */ + FMTP_SUPPRESS_ERRORS = 002 /* 1=Do not emit error messages. */ + }; + +int parse_format_specifier (struct fmt_spec *input, enum fmt_parse_flags); +int parse_format_specifier_name (const char **cp, enum fmt_parse_flags); +int check_input_specifier (const struct fmt_spec *spec, int emit_error); +int check_output_specifier (const struct fmt_spec *spec, int emit_error); +bool check_specifier_type (const struct fmt_spec *, int type, bool emit_error); +bool check_specifier_width (const struct fmt_spec *, + int width, bool emit_error); void convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output); int get_format_var_width (const struct fmt_spec *); int parse_string_as_format (const char *s, int len, const struct fmt_spec *fp,