X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Freadtokens.h;h=45a0c4874d3b913b024f398e34d20032182018d7;hb=a7cc0db9f5f6c63936c6914d4bb6448789774e5f;hp=4d6e5b5099003a0f4c4f97e2cd87fd5dd2abc07d;hpb=64f87b06f189503e42cfb3ee55fef179dfc1ac7a;p=gnulib.git

diff --git a/lib/readtokens.h b/lib/readtokens.h
index 4d6e5b509..45a0c4874 100644
--- a/lib/readtokens.h
+++ b/lib/readtokens.h
@@ -1,6 +1,6 @@
 /* readtokens.h -- Functions for reading tokens from an input stream.
 
-   Copyright (C) 1990, 1991, 1999, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 1999, 2001-2004 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
@@ -14,38 +14,30 @@
 
    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.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
    Written by Jim Meyering. */
 
-#ifndef H_READTOKENS_H
-# define H_READTOKENS_H
+#ifndef READTOKENS_H
+# define READTOKENS_H
 
 # include <stdio.h>
 
-# 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 */
-
 void init_tokenbuffer (token_buffer *tokenbuffer);
 
-long
-  readtoken (FILE *stream, const char *delim, int n_delim,
+size_t
+  readtoken (FILE *stream, const char *delim, size_t n_delim,
 	     token_buffer *tokenbuffer);
-int
-  readtokens (FILE *stream, int projected_n_tokens,
-	      const char *delim, int n_delim,
-	      char ***tokens_out, long **token_lengths);
+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 */