diff options
| author | Jim Meyering <jim@meyering.net> | 2003-06-18 07:39:28 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-06-18 07:39:28 +0000 |
| commit | ee1dffc94cdbecfe0c43dc4d43887aa01cb621aa (patch) | |
| tree | 6f200c6371c9a1d58378e9de4a94335f71527961 /lib | |
| parent | 1c0e2e41d070e8330154c591c44f40cf22366d27 (diff) | |
| download | coreutils-ee1dffc94cdbecfe0c43dc4d43887aa01cb621aa.tar.xz | |
Update from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/linebuffer.c | 6 | ||||
| -rw-r--r-- | lib/linebuffer.h | 21 |
2 files changed, 12 insertions, 15 deletions
diff --git a/lib/linebuffer.c b/lib/linebuffer.c index 8374a8a88..770ad62aa 100644 --- a/lib/linebuffer.c +++ b/lib/linebuffer.c @@ -1,5 +1,7 @@ /* linebuffer.c -- read arbitrarily long lines - Copyright (C) 1986, 1991, 1998, 1999, 2001 Free Software Foundation, Inc. + + Copyright (C) 1986, 1991, 1998, 1999, 2001, 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 @@ -47,7 +49,7 @@ initbuffer (struct linebuffer *linebuffer) Return NULL upon error, or when STREAM is empty. Otherwise, return LINEBUFFER. */ struct linebuffer * -readline (struct linebuffer *linebuffer, FILE *stream) +readlinebuffer (struct linebuffer *linebuffer, FILE *stream) { int c; char *buffer = linebuffer->buffer; diff --git a/lib/linebuffer.h b/lib/linebuffer.h index 4e3549162..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, 1998, 1999 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 @@ -18,6 +20,8 @@ #if !defined LINEBUFFER_H # define LINEBUFFER_H +# include <stdio.h> + /* A `struct linebuffer' holds a line of text. */ struct linebuffer @@ -27,25 +31,16 @@ struct linebuffer 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. */ -void initbuffer PARAMS ((struct linebuffer *linebuffer)); +void initbuffer (struct linebuffer *linebuffer); /* Read an arbitrarily long line of text from STREAM into LINEBUFFER. 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 PARAMS ((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 PARAMS ((struct linebuffer *)); +void freebuffer (struct linebuffer *); #endif /* LINEBUFFER_H */ |