From 66949d7f384e69e0b37b1753f4d2bed33fb0a8de Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 7 Jun 2003 10:16:29 +0000 Subject: [PATCH] (readtokens): Remove anachronistic casts of xmalloc, xrealloc, and xcalloc return values. --- lib/readtokens.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/readtokens.c b/lib/readtokens.c index 74585a586..bb427729c 100644 --- a/lib/readtokens.c +++ b/lib/readtokens.c @@ -1,5 +1,5 @@ /* readtokens.c -- Functions for reading tokens from an input stream. - Copyright (C) 1990-1991, 1999, 2001, 2003 Jim Meyering. + Copyright (C) 1990-1991, 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 @@ -62,7 +62,7 @@ init_tokenbuffer (tokenbuffer) token_buffer *tokenbuffer; { tokenbuffer->size = INITIAL_TOKEN_LENGTH; - tokenbuffer->buffer = ((char *) xmalloc (INITIAL_TOKEN_LENGTH)); + tokenbuffer->buffer = xmalloc (INITIAL_TOKEN_LENGTH); } /* Read a token from `stream' into `tokenbuffer'. @@ -184,8 +184,8 @@ readtokens (FILE *stream, else projected_n_tokens = 64; sz = projected_n_tokens; - tokens = (char **) xmalloc (sz * sizeof (char *)); - lengths = (long *) xmalloc (sz * sizeof (long)); + tokens = xmalloc (sz * sizeof (char *)); + lengths = xmalloc (sz * sizeof (long)); init_tokenbuffer (token); for (;;) @@ -195,8 +195,8 @@ readtokens (FILE *stream, if (n_tokens >= sz) { sz *= 2; - tokens = (char **) xrealloc (tokens, sz * sizeof (char *)); - lengths = (long *) xrealloc (lengths, sz * sizeof (long)); + tokens = xrealloc (tokens, sz * sizeof (char *)); + lengths = xrealloc (lengths, sz * sizeof (long)); } if (token_length < 0) @@ -206,7 +206,7 @@ readtokens (FILE *stream, lengths[n_tokens] = -1; break; } - tmp = (char *) xmalloc ((token_length + 1) * sizeof (char)); + tmp = xmalloc ((token_length + 1) * sizeof (char)); lengths[n_tokens] = token_length; tokens[n_tokens] = strncpy (tmp, token->buffer, (unsigned) (token_length + 1)); -- 2.11.0