X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.h;h=b01faa42c43a88431f7f4b58eb9152be24b9c583;hb=e0b27f6f4cde2d52508db337c76ea81a8ca8ee79;hp=8c54ba3a171448121cc0b4911b3146a21b34e510;hpb=bef05451ef0f1a79d5427d5d4701b2744824c0b4;p=pspp diff --git a/src/data/format.h b/src/data/format.h index 8c54ba3a17..b01faa42c4 100644 --- a/src/data/format.h +++ b/src/data/format.h @@ -86,25 +86,29 @@ struct fmt_spec /* Constructing formats. */ struct fmt_spec fmt_for_input (enum fmt_type, int w, int d) PURE_FUNCTION; struct fmt_spec fmt_for_output (enum fmt_type, int w, int d) PURE_FUNCTION; -struct fmt_spec fmt_for_output_from_input (const struct fmt_spec *, +struct fmt_spec fmt_for_output_from_input (struct fmt_spec, const struct fmt_settings *); struct fmt_spec fmt_default_for_width (int width); /* Verifying formats. */ -bool fmt_check (const struct fmt_spec *, enum fmt_use); -bool fmt_check_input (const struct fmt_spec *); -bool fmt_check_output (const struct fmt_spec *); -bool fmt_check_type_compat (const struct fmt_spec *, enum val_type); -bool fmt_check_width_compat (const struct fmt_spec *, int var_width); - -char *fmt_check__ (const struct fmt_spec *, enum fmt_use); -char *fmt_check_type_compat__ (const struct fmt_spec *, enum val_type); -char *fmt_check_width_compat__ (const struct fmt_spec *, int var_width); +bool fmt_check (struct fmt_spec, enum fmt_use); +bool fmt_check_input (struct fmt_spec); +bool fmt_check_output (struct fmt_spec); +bool fmt_check_type_compat (struct fmt_spec, enum val_type); +bool fmt_check_width_compat (struct fmt_spec, int var_width); + +char *fmt_check__ (struct fmt_spec, enum fmt_use); +char *fmt_check_input__ (struct fmt_spec); +char *fmt_check_output__ (struct fmt_spec); +char *fmt_check_type_compat__ (struct fmt_spec, const char *varname, + enum val_type); +char *fmt_check_width_compat__ (struct fmt_spec, const char *varname, + int var_width); /* Working with formats. */ -int fmt_var_width (const struct fmt_spec *); -char *fmt_to_string (const struct fmt_spec *, char s[FMT_STRING_LEN_MAX + 1]); -bool fmt_equal (const struct fmt_spec *, const struct fmt_spec *); +int fmt_var_width (struct fmt_spec); +char *fmt_to_string (struct fmt_spec, char s[FMT_STRING_LEN_MAX + 1]); +bool fmt_equal (struct fmt_spec, struct fmt_spec); bool fmt_resize (struct fmt_spec *, int new_width); void fmt_fix (struct fmt_spec *, enum fmt_use);