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.

diff --git a/src/flexdef.h b/src/flexdef.h
index 066f8041734203b72c1dca637232e74a192dd1ca..5d3f9251794aec3e025cc7bbaf26ab57c0174c63 100644 (file)
--- 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 *));
 

diff --git a/src/misc.c b/src/misc.c
index d973b24c1b80d941525e97712dad944f1eb30a0c..2bea688c29897f98eef287c9decb0bca570eea18 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -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)

diff --git a/src/sym.c b/src/sym.c
index e6f556c648274512fd6faf3d9bf6523a929cd8c5..8d6b278d3b0d4cab8d8fcc9b1b373c24f717aa9b 100644 (file)
--- a/src/sym.c
+++ b/src/sym.c
@@ -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"));
 }

diff --git a/to.do/unicode/flexdef.h b/to.do/unicode/flexdef.h
index 3e90343832a4eaabef71927b62a617219f8e92aa..8efa775bb8ce637a04f7c61d02ee6cec53cd8f55 100644 (file)
--- a/to.do/unicode/flexdef.h
+++ b/to.do/unicode/flexdef.h
@@ -841,9 +841,6 @@ extern void check_char PROTO((int c));
 /* Replace upper-case letter to lower-case. */
 extern Char clower PROTO((int));
 
-/* Returns a dynamically allocated copy of a (potentially) unsigned string. */
-extern Char *copy_unsigned_string PROTO((register Char *));
-
 /* Shell sort a character array. */
 extern void cshell PROTO((wchar_t[], int, int));
 

diff --git a/to.do/unicode/misc.c b/to.do/unicode/misc.c
index b5b032daf2e6a849b7366bc27769b064f299a8b4..d56d8115b67d167191518aa38789b4948c146e68 100644 (file)
--- a/to.do/unicode/misc.c
+++ b/to.do/unicode/misc.c
@@ -193,29 +193,6 @@ register int c;
        }
 
 
-/* copy_unsigned_string -
- *    returns a dynamically allocated copy of a (potentially) unsigned string
- */
-
-Char *copy_unsigned_string( str )
-register Char *str;
-       {
-       register Char *c;
-       Char *copy;
-
-       /* find length */
-       for ( c = str; *c; ++c )
-               ;
-
-       copy = allocate_Character_array( c - str + 1 );
-
-       for ( c = copy; (*c++ = *str++) != 0; )
-               ;
-
-       return copy;
-       }
-
-
 /* cshell - shell sort a character array in increasing order
  *
  * synopsis