projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(readname, default_index, line_size, readname):
[gnulib.git]
/
lib
/
linebuffer.h
diff --git
a/lib/linebuffer.h
b/lib/linebuffer.h
index
c99a758
..
67d3599
100644
(file)
--- a/
lib/linebuffer.h
+++ b/
lib/linebuffer.h
@@
-1,5
+1,7
@@
/* linebuffer.h -- declarations for reading arbitrarily long lines
/* linebuffer.h -- declarations for reading arbitrarily long lines
- Copyright (C) 1986, 1991, 1998 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
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
@@
-18,33
+20,27
@@
#if !defined LINEBUFFER_H
# define LINEBUFFER_H
#if !defined LINEBUFFER_H
# define LINEBUFFER_H
+# include <stdio.h>
+
/* A `struct linebuffer' holds a line of text. */
struct linebuffer
{
/* 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;
};
char *buffer;
};
-# ifndef PARAMS
-# if defined PROTOTYPES || (defined __STDC__ && __STDC__)
-# define PARAMS(Args) Args
-# else
-# define PARAMS(Args) ()
-# endif
-# endif
-
/* Initialize linebuffer LINEBUFFER for use. */
/* Initialize linebuffer LINEBUFFER for use. */
-void initbuffer
PARAMS ((struct linebuffer *linebuffer)
);
+void initbuffer
(struct linebuffer *linebuffer
);
/* Read an arbitrarily long line of text from STREAM into 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. */
Return LINEBUFFER, except at end of file return 0. */
-struct linebuffer *readline PARAMS ((struct linebuffer *linebuffer,
- FILE *stream));
+struct linebuffer *readlinebuffer (struct linebuffer *linebuffer, FILE *stream);
/* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
/* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
-void freebuffer
PARAMS ((struct linebuffer *)
);
+void freebuffer
(struct linebuffer *
);
#endif /* LINEBUFFER_H */
#endif /* LINEBUFFER_H */