X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable.h;h=293c0c0d035619450c1da4ddbda3bbf077aecefa;hb=59981a5060a0e672b98655be240886d89a513d31;hp=3cfac38611fbc0d21cc96a2e28025367243bd2f6;hpb=5cc88fdabd7f3bd107052538f9f1b961f4914385;p=pspp-builds.git diff --git a/src/output/table.h b/src/output/table.h index 3cfac386..293c0c0d 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -155,7 +155,6 @@ void tab_box (struct tab_table *, int f_h, int f_v, int i_h, int i_v, enum { TAT_NONE = 0, /* No options. */ - TAT_PRINTF = 0x0100, /* Format the text string with sprintf. */ TAT_TITLE = 0x0200 | TAB_EMPH, /* Title attributes. */ TAT_NOWRAP = 0x0800 /* No text wrap (tab_output_text() only). */ }; @@ -172,11 +171,15 @@ void tab_fixed (struct tab_table *, int c, int r, unsigned char opt, void tab_double (struct tab_table *, int c, int r, unsigned char opt, double v, const struct fmt_spec *); -void tab_text (struct tab_table *, int c, int r, unsigned opt, - const char *, ...) +void tab_text (struct tab_table *, int c, int r, unsigned opt, const char *); +void tab_text_format (struct tab_table *, int c, int r, unsigned opt, + const char *, ...) PRINTF_FORMAT (5, 6); + void tab_joint_text (struct tab_table *, int x1, int y1, int x2, int y2, - unsigned opt, const char *, ...) + unsigned opt, const char *); +void tab_joint_text_format (struct tab_table *, int x1, int y1, int x2, int y2, + unsigned opt, const char *, ...) PRINTF_FORMAT (7, 8); /* Cell low-level access. */ @@ -193,7 +196,8 @@ void tab_next_row (struct tab_table *); #define tab_col(TABLE) ((TABLE)->col_ofs) /* Simple output. */ -void tab_output_text (int options, const char *string, ...) +void tab_output_text (int options, const char *string); +void tab_output_text_format (int options, const char *, ...) PRINTF_FORMAT (2, 3); #endif /* tab_h */