Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 09:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(concat2, tr, compute_base_name): Use xmalloc (N) rather than XMALLOC

Browse Source 
(char, N).
(filename_split): Rewrite to avoid cast.
This commit is contained in:
Paul Eggert
2002-12-13 07:52:29 +00:00
parent 69cecfeb38
commit 82129ef5d5
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/files.c
View File

@@ -1,4 +1,5 @@
/* Open and close files for bison, /* Open and close files for Bison.
Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002 Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
Free Software Foundation, Inc. Free Software Foundation, Inc.
@@ -75,7 +76,7 @@ static char *
concat2 (char const *str1, char const *str2) concat2 (char const *str1, char const *str2)
{ {
size_t len = strlen (str1) + strlen (str2); size_t len = strlen (str1) + strlen (str2);
char *res = XMALLOC (char, len + 1); char *res = xmalloc (len + 1);
char *cp; char *cp;
cp = stpcpy (res, str1); cp = stpcpy (res, str1);
cp = stpcpy (cp, str2); cp = stpcpy (cp, str2);
@@ -127,9 +128,7 @@ static char *
tr (const char *in, char from, char to) tr (const char *in, char from, char to)
{ {
char *temp; char *temp;
char *out; char *out = xmalloc (strlen (in) + 1);
out = XMALLOC (char, strlen (in) + 1);
for (temp = out; *in; in++, out++) for (temp = out; *in; in++, out++)
if (*in == from) if (*in == from)
@@ -201,13 +200,17 @@ filename_split (const char *filename,
*ext = strrchr (*base, '.'); *ext = strrchr (*base, '.');
*tab = NULL; *tab = NULL;
/* If there is an exentension, check if there is a `.tab' part right /* If there is an extension, check if there is a `.tab' part right
before. */ before. */
if (*ext if (*ext)
&& (*ext - *base) > (int) strlen (".tab") {
&& (!strncmp (*ext - strlen (".tab"), ".tab", strlen (".tab")) size_t baselen = *ext - *base;
|| !strncmp (*ext - strlen ("_tab"), "_tab", strlen ("_tab")))) size_t dottablen = 4;
*tab = *ext - strlen (".tab"); if (dottablen < baselen
&& (strncmp (*ext - dottablen, ".tab", dottablen) == 0
|| strncmp (*ext - dottablen, "_tab", dottablen) == 0))
*tab = *ext - dottablen;
}
} }
@@ -272,8 +275,7 @@ compute_base_names (void)
(strlen (base) - (ext ? strlen (ext) : 0))); (strlen (base) - (ext ? strlen (ext) : 0)));
} }
full_base_name = XMALLOC (char, full_base_name = xmalloc (strlen (short_base_name)
strlen (short_base_name)
+ strlen (TAB_EXT) + 1); + strlen (TAB_EXT) + 1);
stpcpy (stpcpy (full_base_name, short_base_name), TAB_EXT); stpcpy (stpcpy (full_base_name, short_base_name), TAB_EXT);