X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadtokens.h;h=a98979b9284759cfbe2246a46ce7bd3718c1ed0b;hb=fb6aa6ad7dd950729f4e3349d89d4ad82761af61;hp=b35cf6e33a6f2b3b6ec7776b9db89ef269aa75b5;hpb=84fdd39f05ad45f6126fa58023fd73a876c85733;p=gnulib.git

diff --git a/lib/readtokens.h b/lib/readtokens.h
index b35cf6e33..a98979b92 100644
--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -1,36 +1,43 @@
-#ifndef H_READTOKENS_H
-#define H_READTOKENS_H
+/* readtokens.h -- Functions for reading tokens from an input stream.
 
-#ifndef INITIAL_TOKEN_LENGTH
-#define INITIAL_TOKEN_LENGTH 20
-#endif
+   Copyright (C) 1990-1991, 1999, 2001-2004, 2009-2011 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
+   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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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, see <http://www.gnu.org/licenses/>.
+
+   Written by Jim Meyering. */
+
+#ifndef READTOKENS_H
+# define READTOKENS_H
+
+# include <stdio.h>
 
-#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 */