diff options
author | Michael McConville <mmcconville@mykolab.com> | 2015-12-05 17:42:40 -0500 |
---|---|---|
committer | Michael McConville <mmcconville@mykolab.com> | 2015-12-05 17:42:40 -0500 |
commit | 3a1d84cfc0988a3dbdba7a440571e987cb68973a (patch) | |
tree | ba21703f11c3ee99a7c8e5b8d1a161d0a9b21f2c /src | |
parent | a562291415922732e22cd23cd330901ffa57db45 (diff) |
Replace copy_unsigned_string() with xstrdup().
Like copy_string(), copy_unsigned_string() is just a clone of the
stlib's strdup(). We only use it twice. I'm pretty confident that char
signedness is irrelevant in this case.
Diffstat (limited to 'src')
-rw-r--r-- | src/flexdef.h | 3 | ||||
-rw-r--r-- | src/misc.c | 20 | ||||
-rw-r--r-- | src/sym.c | 4 |
3 files changed, 2 insertions, 25 deletions
diff --git a/src/flexdef.h b/src/flexdef.h index 066f804..5d3f925 100644 --- a/src/flexdef.h +++ b/src/flexdef.h @@ -860,9 +860,6 @@ extern unsigned char clower PROTO ((int)); /* strdup() that fails fatally on allocation failures. */ extern char *xstrdup(const char *); -/* Returns a dynamically allocated copy of a (potentially) unsigned string. */ -extern unsigned char *copy_unsigned_string PROTO ((unsigned char *)); - /* Compare two characters for use by qsort with '\0' sorting last. */ extern int cclcmp PROTO ((const void *, const void *)); @@ -251,26 +251,6 @@ char *xstrdup(const char *s) } -/* copy_unsigned_string - - * returns a dynamically allocated copy of a (potentially) unsigned string - */ - -unsigned char *copy_unsigned_string (unsigned char *str) -{ - unsigned char *c; - unsigned char *copy; - - /* find length */ - for (c = str; *c; ++c) ; - - copy = allocate_Character_array (c - str + 1); - - for (c = copy; (*c++ = *str++) != 0;) ; - - return copy; -} - - /* cclcmp - compares two characters for use by qsort with '\0' sorting last. */ int cclcmp (const void *a, const void *b) @@ -120,7 +120,7 @@ void cclinstal (unsigned char ccltxt[], int cclnum) * called unless the symbol is new. */ - (void) addsym ((char *) copy_unsigned_string (ccltxt), + (void) addsym (xstrdup(ccltxt), (char *) 0, cclnum, ccltab, CCL_HASH_SIZE); } @@ -182,7 +182,7 @@ void ndinstal (const char *name, unsigned char definition[]) { if (addsym (xstrdup(name), - (char *) copy_unsigned_string (definition), 0, + xstrdup(definition), 0, ndtbl, NAME_TABLE_HASH_SIZE)) synerr (_("name defined twice")); } |