X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Freadtokens.h;h=41632cc20b45dd294447fc78d67cc2d31b2bfb2e;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=0fb8b463bb9ae82b680e859b8cadcf0c8500b044;hpb=92295bc4b2a378893386efd3cf8cf9bc31024b59;p=gnulib.git
diff --git a/lib/readtokens.h b/lib/readtokens.h
index 0fb8b463b..41632cc20 100644
--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -1,11 +1,12 @@
/* readtokens.h -- Functions for reading tokens from an input stream.
- Copyright (C) 1990, 1991, 1999, 2001, 2003 Jim Meyering.
+ Copyright (C) 1990-1991, 1999, 2001-2004, 2009-2010 Free Software
+ Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,46 +14,30 @@
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, see .
Written by Jim Meyering. */
-#ifndef H_READTOKENS_H
-# define H_READTOKENS_H
+#ifndef READTOKENS_H
+# define READTOKENS_H
# include
-# ifndef INITIAL_TOKEN_LENGTH
-# define INITIAL_TOKEN_LENGTH 20
-# endif
-
-# ifndef TOKENBUFFER_DEFINED
-# define TOKENBUFFER_DEFINED
struct tokenbuffer
{
- long size;
+ size_t size;
char *buffer;
};
typedef struct tokenbuffer token_buffer;
-# endif /* not TOKENBUFFER_DEFINED */
-
-# undef __P
-# if defined (__STDC__) && __STDC__
-# define __P(x) x
-# else
-# define __P(x) ()
-# endif
-
-void init_tokenbuffer __P ((token_buffer *tokenbuffer));
+void init_tokenbuffer (token_buffer *tokenbuffer);
-long
- readtoken __P ((FILE *stream, const char *delim, int n_delim,
- token_buffer *tokenbuffer));
-int
- readtokens __P ((FILE *stream, int projected_n_tokens,
- const char *delim, int n_delim,
- char ***tokens_out, long **token_lengths));
+size_t
+ readtoken (FILE *stream, const char *delim, size_t n_delim,
+ token_buffer *tokenbuffer);
+size_t
+ readtokens (FILE *stream, size_t projected_n_tokens,
+ const char *delim, size_t n_delim,
+ char ***tokens_out, size_t **token_lengths);
-#endif /* not H_READTOKENS_H */
+#endif /* not READTOKENS_H */