X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ftab.h;h=00d16897d16edd99e34f0a0b1edb3fad8f909ff9;hb=dc4eb33f68d5eebae670115752d3994f4f3d5c41;hp=37e045c961ce035a2b7355050806e759a68442d8;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp

diff --git a/src/tab.h b/src/tab.h
index 37e045c961..00d16897d1 100644
--- a/src/tab.h
+++ b/src/tab.h
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #if !tab_h
 #define tab_h 1
@@ -64,7 +64,7 @@ struct tab_joined_cell
     int x1, y1;
     int x2, y2;
     int hit;
-    struct len_string contents;
+    struct fixed_string contents;
   };
 
 struct outp_driver;
@@ -79,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 len_string title;	/* Table title. */
+    struct fixed_string 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 len_string *cc;	/* Cell contents; len_string *[nr][nc]. */
+    struct fixed_string *cc;	/* Cell contents; fixed_string *[nr][nc]. */
     unsigned char *ct;		/* Cell types; unsigned char[nr][nc]. */
     unsigned char *rh;		/* Horiz rules; unsigned char[nr+1][nc]. */
     unsigned char *trh;		/* Types of horiz rules; [nr+1]. */
@@ -169,15 +169,15 @@ void tab_float (struct tab_table *, int c, int r, unsigned char opt,
 		double v, int w, int d);
 void tab_text (struct tab_table *, int c, int r, unsigned opt,
 	       const char *, ...)
-     __attribute__ ((format (printf, 5, 6)));
+     PRINTF_FORMAT (5, 6);
 void tab_joint_text (struct tab_table *, int x1, int y1, int x2, int y2,
 		     unsigned opt, const char *, ...)
-     __attribute__ ((format (printf, 7, 8)));
+     PRINTF_FORMAT (7, 8);
 
 /* 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 len_string *);
+	      struct fixed_string *);
 
 /* Editing. */
 void tab_offset (struct tab_table *, int col, int row);
@@ -189,7 +189,7 @@ void tab_next_row (struct tab_table *);
 
 /* Simple output. */
 void tab_output_text (int options, const char *string, ...)
-     __attribute__ ((format (printf, 2, 3)));
+     PRINTF_FORMAT (2, 3);
 
 #endif /* tab_h */