diff options
| author | Ted Lemon <source@isc.org> | 1996-08-29 09:13:41 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 1996-08-29 09:13:41 +0000 |
| commit | 50b025a3d7dd305f999295de8e4e9d0f342dd764 (patch) | |
| tree | 83f548f2839f6249dbd3448e067e014c0e4a8b1e /common | |
| parent | 48c31ed244e42b5ea848775161b1fa49d78057a6 (diff) | |
| download | isc-dhcp-50b025a3d7dd305f999295de8e4e9d0f342dd764.tar.gz | |
Rename ATOM to NAME
Diffstat (limited to 'common')
| -rw-r--r-- | common/conflex.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/common/conflex.c b/common/conflex.c index dc345654..57f24db7 100644 --- a/common/conflex.c +++ b/common/conflex.c @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: conflex.c,v 1.15 1996/08/28 01:41:11 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: conflex.c,v 1.16 1996/08/29 09:13:41 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -78,7 +78,7 @@ static int get_token PROTO ((FILE *)); static void skip_to_eol PROTO ((FILE *)); static int read_string PROTO ((FILE *)); static int read_number PROTO ((int, FILE *)); -static int read_num_or_atom PROTO ((int, FILE *)); +static int read_num_or_name PROTO ((int, FILE *)); static int intern PROTO ((char *, int)); void new_parse (name) @@ -164,7 +164,7 @@ static int get_token (cfile) } else if (isascii (c) && isalpha (c)) { lexline = l; lexchar = p; - ttok = read_num_or_atom (c, cfile); + ttok = read_num_or_name (c, cfile); break; } else { lexline = l; @@ -295,9 +295,9 @@ static int read_number (c, cfile) #ifndef OLD_LEXER } else if (isascii (c) && !isxdigit (c) && (c == '-' || c == '_' || isalpha (c))) { - token = ATOM; + token = NAME; } else if (isascii (c) && !isdigit (c) && isxdigit (c)) { - token = NUMBER_OR_ATOM; + token = NUMBER_OR_NAME; #endif } else if (!isascii (c) || !isxdigit (c)) { ungetc (c, cfile); @@ -315,12 +315,12 @@ static int read_number (c, cfile) return token; } -static int read_num_or_atom (c, cfile) +static int read_num_or_name (c, cfile) int c; FILE *cfile; { int i = 0; - int rv = NUMBER_OR_ATOM; + int rv = NUMBER_OR_NAME; tokbuf [i++] = c; for (; i < sizeof tokbuf; i++) { c = get_char (cfile); @@ -331,7 +331,7 @@ static int read_num_or_atom (c, cfile) break; } if (!isxdigit (c)) - rv = ATOM; + rv = NAME; tokbuf [i] = c; } if (i == sizeof tokbuf) { |