diff options
-rw-r--r-- | src/flexdef.h | 6 | ||||
-rw-r--r-- | src/misc.c | 27 |
2 files changed, 2 insertions, 31 deletions
diff --git a/src/flexdef.h b/src/flexdef.h index dd643a7..9dac654 100644 --- a/src/flexdef.h +++ b/src/flexdef.h @@ -845,9 +845,6 @@ extern void flexfatal(const char *); }while(0) #endif /* ! HAVE_DECL___func__ */ -/* Convert a hexadecimal digit string to an integer value. */ -extern unsigned int htoui(unsigned char[]); - /* Report an error message formatted */ extern void lerr(const char *, ...) #if defined(__GNUC__) && __GNUC__ >= 3 @@ -884,9 +881,6 @@ extern int myctoi(const char *); /* Return character corresponding to escape sequence. */ extern unsigned char myesc(unsigned char[]); -/* Convert an octal digit string to an integer value. */ -extern unsigned int otoui(unsigned char[]); - /* Output a (possibly-formatted) string to the generated scanner. */ extern void out(const char *); extern void out_dec(const char *, int); @@ -306,18 +306,6 @@ void flexfatal (const char *msg) } -/* htoui - convert a hexadecimal digit string to an unsigned integer value */ - -unsigned int htoui (unsigned char str[]) -{ - unsigned int result; - - (void) sscanf ((char *) str, "%x", &result); - - return result; -} - - /* lerr - report an error message */ void lerr (const char *msg, ...) @@ -528,7 +516,7 @@ unsigned char myesc (unsigned char array[]) c = array[sptr]; array[sptr] = '\0'; - esc_char = (unsigned char) otoui (array + 1); + esc_char = (unsigned char) strtoul (array + 1, NULL, 8); array[sptr] = c; @@ -550,7 +538,7 @@ unsigned char myesc (unsigned char array[]) c = array[sptr]; array[sptr] = '\0'; - esc_char = (unsigned char) htoui (array + 2); + esc_char = (unsigned char) strtoul (array + 2, NULL, 16); array[sptr] = c; @@ -563,17 +551,6 @@ unsigned char myesc (unsigned char array[]) } -/* otoui - convert an octal digit string to an unsigned integer value */ - -unsigned int otoui (unsigned char str[]) -{ - unsigned int result; - - (void) sscanf ((char *) str, "%o", &result); - return result; -} - - /* out - various flavors of outputing a (possibly formatted) string for the * generated scanner, keeping track of the line count. */ |