X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadtokens.h;h=79582074a74169fa2e07be4ebc57337f18b1fc0a;hb=cbb86267fda18ba3e409e16cf9c460cbbed1846c;hp=0fb8b463bb9ae82b680e859b8cadcf0c8500b044;hpb=92295bc4b2a378893386efd3cf8cf9bc31024b59;p=gnulib.git

diff --git a/lib/readtokens.h b/lib/readtokens.h
index 0fb8b463b..79582074a 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 Jim Meyering.
+   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
@@ -18,41 +18,26 @@
 
    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 */
-
-# 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 */