X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fformat.h;h=d05e4436215b8d17a76507bcf9cda3be2da77186;hb=8180c5dd1591446174c0753ee960921786113403;hp=43e8221504e04077c24673f9ae4c4dbcd755dbf1;hpb=3328de5b6568b4dc85562b25add87c068b579cda;p=pspp diff --git a/src/data/format.h b/src/data/format.h index 43e8221504..d05e443621 100644 --- a/src/data/format.h +++ b/src/data/format.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2012 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -73,7 +73,7 @@ struct fmt_spec { enum fmt_type type; /* One of FMT_*. */ int w; /* Width. */ - int d; /* Number of implied decimal places. */ + int d; /* Number of decimal places. */ }; /* Maximum width of any numeric format. */ @@ -96,7 +96,7 @@ bool fmt_check_width_compat (const struct fmt_spec *, int var_width); 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 *); -void fmt_resize (struct fmt_spec *, int new_width); +bool fmt_resize (struct fmt_spec *, int new_width); void fmt_fix (struct fmt_spec *, enum fmt_use); void fmt_fix_input (struct fmt_spec *); @@ -134,7 +134,7 @@ bool fmt_usable_for_input (enum fmt_type) PURE_FUNCTION; int fmt_to_io (enum fmt_type) PURE_FUNCTION; bool fmt_from_io (int io, enum fmt_type *); -const char *fmt_date_template (enum fmt_type) PURE_FUNCTION; +const char *fmt_date_template (enum fmt_type, int width) PURE_FUNCTION; const char *fmt_gui_name (enum fmt_type); /* Format settings. @@ -185,5 +185,8 @@ int fmt_affix_width (const struct fmt_number_style *); int fmt_neg_affix_width (const struct fmt_number_style *); extern const struct fmt_spec F_8_0 ; +extern const struct fmt_spec F_8_2 ; +extern const struct fmt_spec F_4_3 ; +extern const struct fmt_spec F_5_1 ; #endif /* data/format.h */