dfa: remove some useless casts

* src/dfa.c (icatalloc): Change type of "old" parameter
from "char const *" to "char *".
Don't cast-away const on realloc argument.
Remove now-unnecessary const-discarding cast.
Don't (void)-cast strcpy result.
* src/dosbuf.c (undossify_input): Remove anachronistic
cast-to-"char *" of realloc argument.
This commit is contained in:
Jim Meyering 2011-06-21 10:24:07 +02:00
parent bfd71eeff1
commit 4eddaace7e
2 changed files with 5 additions and 5 deletions

View File

@ -3625,7 +3625,7 @@ dfafree (struct dfa *d)
'psi|epsilon' is likelier)? */
static char *
icatalloc (char const *old, char const *new)
icatalloc (char *old, char const *new)
{
char *result;
size_t oldsize, newsize;
@ -3634,14 +3634,14 @@ icatalloc (char const *old, char const *new)
if (old == NULL)
oldsize = 0;
else if (newsize == 0)
return (char *) old;
return old;
else oldsize = strlen(old);
if (old == NULL)
result = malloc(newsize + 1);
else
result = realloc((void *) old, oldsize + newsize + 1);
result = realloc(old, oldsize + newsize + 1);
if (result != NULL && new != NULL)
(void) strcpy(result + oldsize, new);
strcpy(result + oldsize, new);
return result;
}

View File

@ -124,7 +124,7 @@ undossify_input (char *buf, size_t buflen)
if (inp_map_idx >= dos_pos_map_size - 1)
{
dos_pos_map_size = inp_map_idx ? inp_map_idx * 2 : 1000;
dos_pos_map = xrealloc((char *)dos_pos_map,
dos_pos_map = xrealloc(dos_pos_map,
dos_pos_map_size *
sizeof(struct dos_map));
}