X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Ftable.h;h=00f14180433e6e19be5d8a8d9c03c0822509a6c6;hb=ef3180d0aa38754c8756ea688e3ecaf2e823bba4;hp=6245d12bdb7687f671a04bcfb626be031956a1f7;hpb=1ba9ab71de8a6528beaf22de3ee6d2eb697eb61d;p=pspp-builds.git diff --git a/src/output/table.h b/src/output/table.h index 6245d12b..00f14180 100644 --- a/src/output/table.h +++ b/src/output/table.h @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -65,7 +64,7 @@ struct tab_joined_cell int x1, y1; int x2, y2; int hit; - struct fixed_string contents; + struct substring contents; }; struct outp_driver; @@ -80,12 +79,12 @@ struct tab_table /* Contents. */ int col_style; /* Columns: One of TAB_COL_*. */ int col_group; /* Number of rows per column group. */ - struct fixed_string title; /* Table title. */ + char *title; /* Table title. */ unsigned flags; /* SOMF_*. */ int nc, nr; /* Number of columns, rows. */ int cf; /* Column factor for indexing purposes. */ int l, r, t, b; /* Number of header rows on each side. */ - struct fixed_string *cc; /* Cell contents; fixed_string *[nr][nc]. */ + struct substring *cc; /* Cell contents; substring *[nr][nc]. */ unsigned char *ct; /* Cell types; unsigned char[nr][nc]. */ unsigned char *rh; /* Horiz rules; unsigned char[nr+1][nc]. */ unsigned char *rv; /* Vert rules; unsigned char[nr][nc+1]. */ @@ -170,7 +169,7 @@ void tab_joint_text (struct tab_table *, int x1, int y1, int x2, int y2, /* Cell low-level access. */ #define tab_alloc(TABLE, AMT) pool_alloc ((TABLE)->container, (AMT)) void tab_raw (struct tab_table *, int c, int r, unsigned opt, - struct fixed_string *); + struct substring *); /* Editing. */ void tab_offset (struct tab_table *, int col, int row);