X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.h;h=67d359984b19fd3bb3edab21ccc1c5f8b5938fca;hb=39e82e46dde285e3ed536bf9b089904cd2b04c3c;hp=70781de3b79fa5ccea3c5fce3b19a630560f292a;hpb=51f9f340fb6fa08f17f447a60bb142eefd71dd54;p=gnulib.git

diff --git a/lib/linebuffer.h b/lib/linebuffer.h
index 70781de3b..67d359984 100644
--- a/lib/linebuffer.h
+++ b/lib/linebuffer.h
@@ -1,5 +1,7 @@
 /* linebuffer.h -- declarations for reading arbitrarily long lines
-   Copyright (C) 1986, 1991 Free Software Foundation, Inc.
+
+   Copyright (C) 1986, 1991, 1998, 1999, 2002, 2003 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
@@ -12,32 +14,33 @@
    GNU General Public License for more details.
 
    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.  */
-
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#if !defined LINEBUFFER_H
+# define LINEBUFFER_H
+
+# include <stdio.h>
+
 /* A `struct linebuffer' holds a line of text. */
 
 struct linebuffer
 {
-  long size;			/* Allocated. */
-  long length;			/* Used. */
+  size_t size;			/* Allocated. */
+  size_t length;		/* Used. */
   char *buffer;
 };
 
-#undef __P
-#if defined (__STDC__) && __STDC__
-#define	__P(x) x
-#else
-#define	__P(x) ()
-#endif
-
 /* Initialize linebuffer LINEBUFFER for use. */
-void initbuffer __P ((struct linebuffer *linebuffer));
+void initbuffer (struct linebuffer *linebuffer);
 
 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Remove any newline.  Does not null terminate.
+   Keep the newline; append a newline if it's the last line of a file
+   that ends in a non-newline character.  Do not null terminate.
    Return LINEBUFFER, except at end of file return 0.  */
-struct linebuffer *readline __P ((struct linebuffer *linebuffer, FILE *stream));
+struct linebuffer *readlinebuffer (struct linebuffer *linebuffer, FILE *stream);
 
 /* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
-void freebuffer __P ((struct linebuffer *));
+void freebuffer (struct linebuffer *);
+
+#endif /* LINEBUFFER_H */