frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: parser: rename STRING for fixing name conflict 

Resolve name conflict with Sun's <sys/kbd.h> by renaming STRING enum
value to XF86_TOKEN_STRING.

This way, don't need the special #undef hack anymore.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-13 20:34:56 +01:00
parent 4bc4ad19aa
commit c29bda1c51
17 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/parser/DRI.c
View File

@ -58,7 +58,7 @@ xf86parseDRISection(void)
while ((token = xf86getToken(DRITab)) != ENDSECTION) { while ((token = xf86getToken(DRITab)) != ENDSECTION) {
switch (token) { switch (token) {
case GROUP: case GROUP:
if ((token = xf86getSubToken(&(ptr->dri_comment))) == STRING) if ((token = xf86getSubToken(&(ptr->dri_comment))) == XF86_TOKEN_STRING)
ptr->dri_group_name = xf86_lex_val.str; ptr->dri_group_name = xf86_lex_val.str;
else if (token == NUMBER) else if (token == NUMBER)
ptr->dri_group = xf86_lex_val.num; ptr->dri_group = xf86_lex_val.num;

20
hw/xfree86/parser/Device.c
View File

@ -110,7 +110,7 @@ xf86parseDeviceSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -118,32 +118,32 @@ xf86parseDeviceSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case VENDOR: case VENDOR:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Vendor"); Error(QUOTE_MSG, "Vendor");
ptr->dev_vendor = xf86_lex_val.str; ptr->dev_vendor = xf86_lex_val.str;
break; break;
case BOARD: case BOARD:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Board"); Error(QUOTE_MSG, "Board");
ptr->dev_board = xf86_lex_val.str; ptr->dev_board = xf86_lex_val.str;
break; break;
case CHIPSET: case CHIPSET:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Chipset"); Error(QUOTE_MSG, "Chipset");
ptr->dev_chipset = xf86_lex_val.str; ptr->dev_chipset = xf86_lex_val.str;
break; break;
case CARD: case CARD:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Card"); Error(QUOTE_MSG, "Card");
ptr->dev_card = xf86_lex_val.str; ptr->dev_card = xf86_lex_val.str;
break; break;
case DRIVER: case DRIVER:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Driver"); Error(QUOTE_MSG, "Driver");
ptr->dev_driver = xf86_lex_val.str; ptr->dev_driver = xf86_lex_val.str;
break; break;
case RAMDAC: case RAMDAC:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Ramdac"); Error(QUOTE_MSG, "Ramdac");
ptr->dev_ramdac = xf86_lex_val.str; ptr->dev_ramdac = xf86_lex_val.str;
break; break;
@ -187,7 +187,7 @@ xf86parseDeviceSection(void)
ptr->dev_io_base = xf86_lex_val.num; ptr->dev_io_base = xf86_lex_val.num;
break; break;
case CLOCKCHIP: case CLOCKCHIP:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "ClockChip"); Error(QUOTE_MSG, "ClockChip");
ptr->dev_clockchip = xf86_lex_val.str; ptr->dev_clockchip = xf86_lex_val.str;
break; break;
@ -213,7 +213,7 @@ xf86parseDeviceSection(void)
xf86unGetToken(token); xf86unGetToken(token);
break; break;
case MATCHSEAT: case MATCHSEAT:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchSeat"); Error(QUOTE_MSG, "MatchSeat");
ptr->match_seat = xf86_lex_val.str; ptr->match_seat = xf86_lex_val.str;
break; break;
@ -221,7 +221,7 @@ xf86parseDeviceSection(void)
ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst); ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst);
break; break;
case BUSID: case BUSID:
if (xf86getSubToken(&(ptr->dev_comment)) != STRING) if (xf86getSubToken(&(ptr->dev_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "BusID"); Error(QUOTE_MSG, "BusID");
ptr->dev_busid = xf86_lex_val.str; ptr->dev_busid = xf86_lex_val.str;
break; break;

8
hw/xfree86/parser/Files.c
View File

@ -95,7 +95,7 @@ xf86parseFilesSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case FONTPATH: case FONTPATH:
if (xf86getSubToken(&(ptr->file_comment)) != STRING) if (xf86getSubToken(&(ptr->file_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "FontPath"); Error(QUOTE_MSG, "FontPath");
j = FALSE; j = FALSE;
str = xf86_lex_val.str; str = xf86_lex_val.str;
@ -118,7 +118,7 @@ xf86parseFilesSection(void)
free(xf86_lex_val.str); free(xf86_lex_val.str);
break; break;
case MODULEPATH: case MODULEPATH:
if (xf86getSubToken(&(ptr->file_comment)) != STRING) if (xf86getSubToken(&(ptr->file_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "ModulePath"); Error(QUOTE_MSG, "ModulePath");
l = FALSE; l = FALSE;
str = xf86_lex_val.str; str = xf86_lex_val.str;
@ -145,12 +145,12 @@ xf86parseFilesSection(void)
free(xf86_lex_val.str); free(xf86_lex_val.str);
break; break;
case LOGFILEPATH: case LOGFILEPATH:
if (xf86getSubToken(&(ptr->file_comment)) != STRING) if (xf86getSubToken(&(ptr->file_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "LogFile"); Error(QUOTE_MSG, "LogFile");
ptr->file_logfile = xf86_lex_val.str; ptr->file_logfile = xf86_lex_val.str;
break; break;
case XKBDIR: case XKBDIR:
if (xf86getSubToken(&(ptr->file_xkbdir)) != STRING) if (xf86getSubToken(&(ptr->file_xkbdir)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "XkbDir"); Error(QUOTE_MSG, "XkbDir");
ptr->file_xkbdir = xf86_lex_val.str; ptr->file_xkbdir = xf86_lex_val.str;
break; break;

6
hw/xfree86/parser/Flags.c
View File

@ -134,7 +134,7 @@ xf86parseFlagsSection(void)
if (hasvalue) { if (hasvalue) {
tokentype = xf86getSubToken(&(ptr->flg_comment)); tokentype = xf86getSubToken(&(ptr->flg_comment));
if (strvalue) { if (strvalue) {
if (tokentype != STRING) if (tokentype != XF86_TOKEN_STRING)
Error(QUOTE_MSG, tmp); Error(QUOTE_MSG, tmp);
valstr = xf86_lex_val.str; valstr = xf86_lex_val.str;
} }
@ -431,14 +431,14 @@ xf86parseOption(XF86OptionPtr head)
char *name, *comment = NULL; char *name, *comment = NULL;
int token; int token;
if ((token = xf86getSubToken(&comment)) != STRING) { if ((token = xf86getSubToken(&comment)) != XF86_TOKEN_STRING) {
xf86parseError(BAD_OPTION_MSG); xf86parseError(BAD_OPTION_MSG);
free(comment); free(comment);
return head; return head;
} }
name = xf86_lex_val.str; name = xf86_lex_val.str;
if ((token = xf86getSubToken(&comment)) == STRING) { if ((token = xf86getSubToken(&comment)) == XF86_TOKEN_STRING) {
option = xf86newOption(name, xf86_lex_val.str); option = xf86newOption(name, xf86_lex_val.str);
assert(option); assert(option);
option->opt_comment = comment; option->opt_comment = comment;

4
hw/xfree86/parser/Input.c
View File

@ -88,7 +88,7 @@ xf86parseInputSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->inp_comment)) != STRING) if (xf86getSubToken(&(ptr->inp_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -96,7 +96,7 @@ xf86parseInputSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case DRIVER: case DRIVER:
if (xf86getSubToken(&(ptr->inp_comment)) != STRING) if (xf86getSubToken(&(ptr->inp_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Driver"); Error(QUOTE_MSG, "Driver");
if (strcmp(xf86_lex_val.str, "keyboard") == 0) { if (strcmp(xf86_lex_val.str, "keyboard") == 0) {
ptr->inp_driver = strdup("kbd"); ptr->inp_driver = strdup("kbd");

36
hw/xfree86/parser/InputClass.c
View File

@ -196,7 +196,7 @@ xf86parseInputClassSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -204,7 +204,7 @@ xf86parseInputClassSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case DRIVER: case DRIVER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Driver"); Error(QUOTE_MSG, "Driver");
if (strcmp(xf86_lex_val.str, "keyboard") == 0) { if (strcmp(xf86_lex_val.str, "keyboard") == 0) {
ptr->driver = strdup("kbd"); ptr->driver = strdup("kbd");
@ -220,7 +220,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_PRODUCT: case MATCH_PRODUCT:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchProduct"); Error(QUOTE_MSG, "MatchProduct");
add_group_entry(&ptr->match_product, add_group_entry(&ptr->match_product,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -231,7 +231,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_VENDOR: case MATCH_VENDOR:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchVendor"); Error(QUOTE_MSG, "MatchVendor");
add_group_entry(&ptr->match_vendor, add_group_entry(&ptr->match_vendor,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -242,7 +242,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_DEVICE_PATH: case MATCH_DEVICE_PATH:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchDevicePath"); Error(QUOTE_MSG, "MatchDevicePath");
add_group_entry(&ptr->match_device, add_group_entry(&ptr->match_device,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -253,7 +253,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_OS: case MATCH_OS:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchOS"); Error(QUOTE_MSG, "MatchOS");
add_group_entry(&ptr->match_os, xstrtokenize(xf86_lex_val.str, add_group_entry(&ptr->match_os, xstrtokenize(xf86_lex_val.str,
TOKEN_SEP), TOKEN_SEP),
@ -264,7 +264,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_PNPID: case MATCH_PNPID:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchPnPID"); Error(QUOTE_MSG, "MatchPnPID");
add_group_entry(&ptr->match_pnpid, add_group_entry(&ptr->match_pnpid,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -275,7 +275,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_USBID: case MATCH_USBID:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchUSBID"); Error(QUOTE_MSG, "MatchUSBID");
add_group_entry(&ptr->match_usbid, add_group_entry(&ptr->match_usbid,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -286,7 +286,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_DRIVER: case MATCH_DRIVER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchDriver"); Error(QUOTE_MSG, "MatchDriver");
add_group_entry(&ptr->match_driver, add_group_entry(&ptr->match_driver,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -297,7 +297,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_TAG: case MATCH_TAG:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchTag"); Error(QUOTE_MSG, "MatchTag");
add_group_entry(&ptr->match_tag, xstrtokenize(xf86_lex_val.str, add_group_entry(&ptr->match_tag, xstrtokenize(xf86_lex_val.str,
TOKEN_SEP), TOKEN_SEP),
@ -308,7 +308,7 @@ xf86parseInputClassSection(void)
matchtype = MATCH_NEGATED; matchtype = MATCH_NEGATED;
/* fallthrough */ /* fallthrough */
case MATCH_LAYOUT: case MATCH_LAYOUT:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchLayout"); Error(QUOTE_MSG, "MatchLayout");
add_group_entry(&ptr->match_layout, add_group_entry(&ptr->match_layout,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP), xstrtokenize(xf86_lex_val.str, TOKEN_SEP),
@ -316,7 +316,7 @@ xf86parseInputClassSection(void)
free(xf86_lex_val.str); free(xf86_lex_val.str);
break; break;
case MATCH_IS_KEYBOARD: case MATCH_IS_KEYBOARD:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsKeyboard"); Error(QUOTE_MSG, "MatchIsKeyboard");
ptr->is_keyboard.set = xf86getBoolValue(&ptr->is_keyboard.val, ptr->is_keyboard.set = xf86getBoolValue(&ptr->is_keyboard.val,
xf86_lex_val.str); xf86_lex_val.str);
@ -325,7 +325,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsKeyboard"); Error(BOOL_MSG, "MatchIsKeyboard");
break; break;
case MATCH_IS_POINTER: case MATCH_IS_POINTER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsPointer"); Error(QUOTE_MSG, "MatchIsPointer");
ptr->is_pointer.set = xf86getBoolValue(&ptr->is_pointer.val, ptr->is_pointer.set = xf86getBoolValue(&ptr->is_pointer.val,
xf86_lex_val.str); xf86_lex_val.str);
@ -334,7 +334,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsPointer"); Error(BOOL_MSG, "MatchIsPointer");
break; break;
case MATCH_IS_JOYSTICK: case MATCH_IS_JOYSTICK:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsJoystick"); Error(QUOTE_MSG, "MatchIsJoystick");
ptr->is_joystick.set = xf86getBoolValue(&ptr->is_joystick.val, ptr->is_joystick.set = xf86getBoolValue(&ptr->is_joystick.val,
xf86_lex_val.str); xf86_lex_val.str);
@ -343,7 +343,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsJoystick"); Error(BOOL_MSG, "MatchIsJoystick");
break; break;
case MATCH_IS_TABLET: case MATCH_IS_TABLET:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsTablet"); Error(QUOTE_MSG, "MatchIsTablet");
ptr->is_tablet.set = xf86getBoolValue(&ptr->is_tablet.val, xf86_lex_val.str); ptr->is_tablet.set = xf86getBoolValue(&ptr->is_tablet.val, xf86_lex_val.str);
free(xf86_lex_val.str); free(xf86_lex_val.str);
@ -351,7 +351,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsTablet"); Error(BOOL_MSG, "MatchIsTablet");
break; break;
case MATCH_IS_TABLET_PAD: case MATCH_IS_TABLET_PAD:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsTabletPad"); Error(QUOTE_MSG, "MatchIsTabletPad");
ptr->is_tablet_pad.set = xf86getBoolValue(&ptr->is_tablet_pad.val, xf86_lex_val.str); ptr->is_tablet_pad.set = xf86getBoolValue(&ptr->is_tablet_pad.val, xf86_lex_val.str);
free(xf86_lex_val.str); free(xf86_lex_val.str);
@ -359,7 +359,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsTabletPad"); Error(BOOL_MSG, "MatchIsTabletPad");
break; break;
case MATCH_IS_TOUCHPAD: case MATCH_IS_TOUCHPAD:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsTouchpad"); Error(QUOTE_MSG, "MatchIsTouchpad");
ptr->is_touchpad.set = xf86getBoolValue(&ptr->is_touchpad.val, ptr->is_touchpad.set = xf86getBoolValue(&ptr->is_touchpad.val,
xf86_lex_val.str); xf86_lex_val.str);
@ -368,7 +368,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsTouchpad"); Error(BOOL_MSG, "MatchIsTouchpad");
break; break;
case MATCH_IS_TOUCHSCREEN: case MATCH_IS_TOUCHSCREEN:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchIsTouchscreen"); Error(QUOTE_MSG, "MatchIsTouchscreen");
ptr->is_touchscreen.set = xf86getBoolValue(&ptr->is_touchscreen.val, ptr->is_touchscreen.set = xf86getBoolValue(&ptr->is_touchscreen.val,
xf86_lex_val.str); xf86_lex_val.str);

22
hw/xfree86/parser/Layout.c
View File

@ -105,7 +105,7 @@ xf86parseLayoutSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -113,7 +113,7 @@ xf86parseLayoutSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case MATCHSEAT: case MATCHSEAT:
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchSeat"); Error(QUOTE_MSG, "MatchSeat");
ptr->match_seat = xf86_lex_val.str; ptr->match_seat = xf86_lex_val.str;
break; break;
@ -123,7 +123,7 @@ xf86parseLayoutSection(void)
iptr = calloc(1, sizeof(XF86ConfInactiveRec)); iptr = calloc(1, sizeof(XF86ConfInactiveRec));
iptr->list.next = NULL; iptr->list.next = NULL;
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) { if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING) {
free(iptr); free(iptr);
Error(INACTIVE_MSG); Error(INACTIVE_MSG);
} }
@ -149,7 +149,7 @@ xf86parseLayoutSection(void)
else else
xf86unGetToken(token); xf86unGetToken(token);
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != STRING) { if (token != XF86_TOKEN_STRING) {
free(aptr); free(aptr);
Error(SCREEN_MSG); Error(SCREEN_MSG);
} }
@ -183,7 +183,7 @@ xf86parseLayoutSection(void)
default: default:
xf86unGetToken(token); xf86unGetToken(token);
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token == STRING) if (token == XF86_TOKEN_STRING)
aptr->adj_where = CONF_ADJ_OBSOLETE; aptr->adj_where = CONF_ADJ_OBSOLETE;
else else
aptr->adj_where = CONF_ADJ_ABSOLUTE; aptr->adj_where = CONF_ADJ_ABSOLUTE;
@ -216,7 +216,7 @@ xf86parseLayoutSection(void)
case CONF_ADJ_BELOW: case CONF_ADJ_BELOW:
case CONF_ADJ_RELATIVE: case CONF_ADJ_RELATIVE:
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != STRING) { if (token != XF86_TOKEN_STRING) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG); Error(INVALID_SCR_MSG);
} }
@ -241,21 +241,21 @@ xf86parseLayoutSection(void)
aptr->adj_top_str = xf86_lex_val.str; aptr->adj_top_str = xf86_lex_val.str;
/* bottom */ /* bottom */
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) { if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING) {
free(aptr); free(aptr);
Error(SCREEN_MSG); Error(SCREEN_MSG);
} }
aptr->adj_bottom_str = xf86_lex_val.str; aptr->adj_bottom_str = xf86_lex_val.str;
/* left */ /* left */
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) { if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING) {
free(aptr); free(aptr);
Error(SCREEN_MSG); Error(SCREEN_MSG);
} }
aptr->adj_left_str = xf86_lex_val.str; aptr->adj_left_str = xf86_lex_val.str;
/* right */ /* right */
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) { if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING) {
free(aptr); free(aptr);
Error(SCREEN_MSG); Error(SCREEN_MSG);
} }
@ -273,12 +273,12 @@ xf86parseLayoutSection(void)
iptr = calloc(1, sizeof(XF86ConfInputrefRec)); iptr = calloc(1, sizeof(XF86ConfInputrefRec));
iptr->list.next = NULL; iptr->list.next = NULL;
iptr->iref_option_lst = NULL; iptr->iref_option_lst = NULL;
if (xf86getSubToken(&(ptr->lay_comment)) != STRING) { if (xf86getSubToken(&(ptr->lay_comment)) != XF86_TOKEN_STRING) {
free(iptr); free(iptr);
Error(INPUTDEV_MSG); Error(INPUTDEV_MSG);
} }
iptr->iref_inputdev_str = xf86_lex_val.str; iptr->iref_inputdev_str = xf86_lex_val.str;
while ((token = xf86getSubToken(&(ptr->lay_comment))) == STRING) { while ((token = xf86getSubToken(&(ptr->lay_comment))) == XF86_TOKEN_STRING) {
iptr->iref_option_lst = iptr->iref_option_lst =
xf86addNewOption(iptr->iref_option_lst, xf86_lex_val.str, NULL); xf86addNewOption(iptr->iref_option_lst, xf86_lex_val.str, NULL);
} }

8
hw/xfree86/parser/Module.c
View File

@ -134,28 +134,28 @@ xf86parseModuleSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case LOAD: case LOAD:
if (xf86getSubToken(&(ptr->mod_comment)) != STRING) if (xf86getSubToken(&(ptr->mod_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Load"); Error(QUOTE_MSG, "Load");
ptr->mod_load_lst = ptr->mod_load_lst =
xf86addNewLoadDirective(ptr->mod_load_lst, xf86_lex_val.str, xf86addNewLoadDirective(ptr->mod_load_lst, xf86_lex_val.str,
XF86_LOAD_MODULE, NULL); XF86_LOAD_MODULE, NULL);
break; break;
case DISABLE: case DISABLE:
if (xf86getSubToken(&(ptr->mod_comment)) != STRING) if (xf86getSubToken(&(ptr->mod_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Disable"); Error(QUOTE_MSG, "Disable");
ptr->mod_disable_lst = ptr->mod_disable_lst =
xf86addNewLoadDirective(ptr->mod_disable_lst, xf86_lex_val.str, xf86addNewLoadDirective(ptr->mod_disable_lst, xf86_lex_val.str,
XF86_DISABLE_MODULE, NULL); XF86_DISABLE_MODULE, NULL);
break; break;
case LOAD_DRIVER: case LOAD_DRIVER:
if (xf86getSubToken(&(ptr->mod_comment)) != STRING) if (xf86getSubToken(&(ptr->mod_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "LoadDriver"); Error(QUOTE_MSG, "LoadDriver");
ptr->mod_load_lst = ptr->mod_load_lst =
xf86addNewLoadDirective(ptr->mod_load_lst, xf86_lex_val.str, xf86addNewLoadDirective(ptr->mod_load_lst, xf86_lex_val.str,
XF86_LOAD_DRIVER, NULL); XF86_LOAD_DRIVER, NULL);
break; break;
case SUBSECTION: case SUBSECTION:
if (xf86getSubToken(&(ptr->mod_comment)) != STRING) if (xf86getSubToken(&(ptr->mod_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "SubSection"); Error(QUOTE_MSG, "SubSection");
ptr->mod_load_lst = ptr->mod_load_lst =
xf86parseModuleSubSection(ptr->mod_load_lst, xf86_lex_val.str); xf86parseModuleSubSection(ptr->mod_load_lst, xf86_lex_val.str);

18
hw/xfree86/parser/Monitor.c
View File

@ -137,7 +137,7 @@ xf86parseModeLine(void)
parsePrologue(XF86ConfModeLinePtr, XF86ConfModeLineRec) parsePrologue(XF86ConfModeLinePtr, XF86ConfModeLineRec)
/* Identifier */ /* Identifier */
if (xf86getSubToken(&(ptr->ml_comment)) != STRING) if (xf86getSubToken(&(ptr->ml_comment)) != XF86_TOKEN_STRING)
Error("ModeLine identifier expected"); Error("ModeLine identifier expected");
ptr->ml_identifier = xf86_lex_val.str; ptr->ml_identifier = xf86_lex_val.str;
@ -262,7 +262,7 @@ xf86parseVerboseMode(void)
parsePrologue(XF86ConfModeLinePtr, XF86ConfModeLineRec) parsePrologue(XF86ConfModeLinePtr, XF86ConfModeLineRec)
if (xf86getSubToken(&(ptr->ml_comment)) != STRING) if (xf86getSubToken(&(ptr->ml_comment)) != XF86_TOKEN_STRING)
Error("Mode name expected"); Error("Mode name expected");
ptr->ml_identifier = xf86_lex_val.str; ptr->ml_identifier = xf86_lex_val.str;
while ((token = xf86getToken(ModeTab)) != ENDMODE) { while ((token = xf86getToken(ModeTab)) != ENDMODE) {
@ -324,9 +324,9 @@ xf86parseVerboseMode(void)
break; break;
case FLAGS: case FLAGS:
token = xf86getSubToken(&(ptr->ml_comment)); token = xf86getSubToken(&(ptr->ml_comment));
if (token != STRING) if (token != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Flags"); Error(QUOTE_MSG, "Flags");
while (token == STRING) { while (token == XF86_TOKEN_STRING) {
token2 = xf86getStringToken(TimingTab); token2 = xf86getStringToken(TimingTab);
switch (token2) { switch (token2) {
case TT_INTERLACE: case TT_INTERLACE:
@ -419,7 +419,7 @@ xf86parseMonitorSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->mon_comment)) != STRING) if (xf86getSubToken(&(ptr->mon_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -427,12 +427,12 @@ xf86parseMonitorSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case VENDOR: case VENDOR:
if (xf86getSubToken(&(ptr->mon_comment)) != STRING) if (xf86getSubToken(&(ptr->mon_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Vendor"); Error(QUOTE_MSG, "Vendor");
ptr->mon_vendor = xf86_lex_val.str; ptr->mon_vendor = xf86_lex_val.str;
break; break;
case MODEL: case MODEL:
if (xf86getSubToken(&(ptr->mon_comment)) != STRING) if (xf86getSubToken(&(ptr->mon_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "ModelName"); Error(QUOTE_MSG, "ModelName");
ptr->mon_modelname = xf86_lex_val.str; ptr->mon_modelname = xf86_lex_val.str;
break; break;
@ -554,7 +554,7 @@ xf86parseMonitorSection(void)
{ {
XF86ConfModesLinkPtr mptr; XF86ConfModesLinkPtr mptr;
if ((token = xf86getSubToken(&(ptr->mon_comment))) != STRING) if ((token = xf86getSubToken(&(ptr->mon_comment))) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "UseModes"); Error(QUOTE_MSG, "UseModes");
/* add to the end of the list of modes sections /* add to the end of the list of modes sections
@ -607,7 +607,7 @@ xf86parseModesSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->modes_comment)) != STRING) if (xf86getSubToken(&(ptr->modes_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");

8
hw/xfree86/parser/OutputClass.c
View File

@ -109,7 +109,7 @@ xf86parseOutputClassSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -117,13 +117,13 @@ xf86parseOutputClassSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case DRIVER: case DRIVER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Driver"); Error(QUOTE_MSG, "Driver");
else else
ptr->driver = xf86_lex_val.str; ptr->driver = xf86_lex_val.str;
break; break;
case MODULEPATH: case MODULEPATH:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "ModulePath"); Error(QUOTE_MSG, "ModulePath");
if (ptr->modulepath) { if (ptr->modulepath) {
char *path; char *path;
@ -139,7 +139,7 @@ xf86parseOutputClassSection(void)
ptr->option_lst = xf86parseOption(ptr->option_lst); ptr->option_lst = xf86parseOption(ptr->option_lst);
break; break;
case MATCH_DRIVER: case MATCH_DRIVER:
if (xf86getSubToken(&(ptr->comment)) != STRING) if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchDriver"); Error(QUOTE_MSG, "MatchDriver");
add_group_entry(&ptr->match_driver, add_group_entry(&ptr->match_driver,
xstrtokenize(xf86_lex_val.str, TOKEN_SEP)); xstrtokenize(xf86_lex_val.str, TOKEN_SEP));

4
hw/xfree86/parser/Pointer.c
View File

@ -108,13 +108,13 @@ xf86parsePointerSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case PROTOCOL: case PROTOCOL:
if (xf86getSubToken(&(ptr->inp_comment)) != STRING) if (xf86getSubToken(&(ptr->inp_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Protocol"); Error(QUOTE_MSG, "Protocol");
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst, ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
strdup("Protocol"), xf86_lex_val.str); strdup("Protocol"), xf86_lex_val.str);
break; break;
case PDEVICE: case PDEVICE:
if (xf86getSubToken(&(ptr->inp_comment)) != STRING) if (xf86getSubToken(&(ptr->inp_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Device"); Error(QUOTE_MSG, "Device");
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst, ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
strdup("Device"), xf86_lex_val.str); strdup("Device"), xf86_lex_val.str);

20
hw/xfree86/parser/Screen.c
View File

@ -149,7 +149,7 @@ xf86parseDisplaySubSection(void)
ptr->disp_bpp = xf86_lex_val.num; ptr->disp_bpp = xf86_lex_val.num;
break; break;
case VISUAL: case VISUAL:
if (xf86getSubToken(&(ptr->disp_comment)) != STRING) if (xf86getSubToken(&(ptr->disp_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Display"); Error(QUOTE_MSG, "Display");
ptr->disp_visual = xf86_lex_val.str; ptr->disp_visual = xf86_lex_val.str;
break; break;
@ -192,7 +192,7 @@ xf86parseDisplaySubSection(void)
while ((token = while ((token =
xf86getSubTokenWithTab(&(ptr->disp_comment), xf86getSubTokenWithTab(&(ptr->disp_comment),
DisplayTab)) == STRING) { DisplayTab)) == XF86_TOKEN_STRING) {
mptr = calloc(1, sizeof(XF86ModeRec)); mptr = calloc(1, sizeof(XF86ModeRec));
mptr->mode_name = xf86_lex_val.str; mptr->mode_name = xf86_lex_val.str;
mptr->list.next = NULL; mptr->list.next = NULL;
@ -262,7 +262,7 @@ xf86parseScreenSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
ptr->scrn_identifier = xf86_lex_val.str; ptr->scrn_identifier = xf86_lex_val.str;
if (has_ident || has_driver) if (has_ident || has_driver)
@ -270,12 +270,12 @@ xf86parseScreenSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case MATCHSEAT: case MATCHSEAT:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "MatchSeat"); Error(QUOTE_MSG, "MatchSeat");
ptr->match_seat = xf86_lex_val.str; ptr->match_seat = xf86_lex_val.str;
break; break;
case OBSDRIVER: case OBSDRIVER:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Driver"); Error(QUOTE_MSG, "Driver");
ptr->scrn_obso_driver = xf86_lex_val.str; ptr->scrn_obso_driver = xf86_lex_val.str;
if (has_ident || has_driver) if (has_ident || has_driver)
@ -298,19 +298,19 @@ xf86parseScreenSection(void)
ptr->scrn_defaultfbbpp = xf86_lex_val.num; ptr->scrn_defaultfbbpp = xf86_lex_val.num;
break; break;
case MDEVICE: case MDEVICE:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Device"); Error(QUOTE_MSG, "Device");
ptr->scrn_device_str = xf86_lex_val.str; ptr->scrn_device_str = xf86_lex_val.str;
break; break;
case GDEVICE: case GDEVICE:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "GPUDevice"); Error(QUOTE_MSG, "GPUDevice");
if (ptr->num_gpu_devices == CONF_MAXGPUDEVICES) if (ptr->num_gpu_devices == CONF_MAXGPUDEVICES)
Error(GPU_DEVICE_TOO_MANY, CONF_MAXGPUDEVICES); Error(GPU_DEVICE_TOO_MANY, CONF_MAXGPUDEVICES);
ptr->scrn_gpu_device_str[ptr->num_gpu_devices++] = xf86_lex_val.str; ptr->scrn_gpu_device_str[ptr->num_gpu_devices++] = xf86_lex_val.str;
break; break;
case MONITOR: case MONITOR:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Monitor"); Error(QUOTE_MSG, "Monitor");
ptr->scrn_monitor_str = xf86_lex_val.str; ptr->scrn_monitor_str = xf86_lex_val.str;
break; break;
@ -318,7 +318,7 @@ xf86parseScreenSection(void)
{ {
XF86ConfAdaptorLinkPtr aptr; XF86ConfAdaptorLinkPtr aptr;
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "VideoAdaptor"); Error(QUOTE_MSG, "VideoAdaptor");
/* Don't allow duplicates */ /* Don't allow duplicates */
@ -348,7 +348,7 @@ xf86parseScreenSection(void)
ptr->scrn_option_lst = xf86parseOption(ptr->scrn_option_lst); ptr->scrn_option_lst = xf86parseOption(ptr->scrn_option_lst);
break; break;
case SUBSECTION: case SUBSECTION:
if (xf86getSubToken(&(ptr->scrn_comment)) != STRING) if (xf86getSubToken(&(ptr->scrn_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "SubSection"); Error(QUOTE_MSG, "SubSection");
{ {
free(xf86_lex_val.str); free(xf86_lex_val.str);

4
hw/xfree86/parser/Vendor.c
View File

@ -157,7 +157,7 @@ xf86parseVendorSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->vnd_comment)) != STRING) if (xf86getSubToken(&(ptr->vnd_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -168,7 +168,7 @@ xf86parseVendorSection(void)
ptr->vnd_option_lst = xf86parseOption(ptr->vnd_option_lst); ptr->vnd_option_lst = xf86parseOption(ptr->vnd_option_lst);
break; break;
case SUBSECTION: case SUBSECTION:
if (xf86getSubToken(&(ptr->vnd_comment)) != STRING) if (xf86getSubToken(&(ptr->vnd_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "SubSection"); Error(QUOTE_MSG, "SubSection");
{ {
HANDLE_LIST(vnd_sub_lst, xf86parseVendorSubSection, HANDLE_LIST(vnd_sub_lst, xf86parseVendorSubSection,

14
hw/xfree86/parser/Video.c
View File

@ -101,7 +101,7 @@ xf86parseVideoPortSubSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->vp_comment)) != STRING) if (xf86getSubToken(&(ptr->vp_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
if (has_ident == TRUE) if (has_ident == TRUE)
Error(MULTIPLE_MSG, "Identifier"); Error(MULTIPLE_MSG, "Identifier");
@ -160,7 +160,7 @@ xf86parseVideoAdaptorSection(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case IDENTIFIER: case IDENTIFIER:
if (xf86getSubToken(&(ptr->va_comment)) != STRING) if (xf86getSubToken(&(ptr->va_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Identifier"); Error(QUOTE_MSG, "Identifier");
ptr->va_identifier = xf86_lex_val.str; ptr->va_identifier = xf86_lex_val.str;
if (has_ident == TRUE) if (has_ident == TRUE)
@ -168,22 +168,22 @@ xf86parseVideoAdaptorSection(void)
has_ident = TRUE; has_ident = TRUE;
break; break;
case VENDOR: case VENDOR:
if (xf86getSubToken(&(ptr->va_comment)) != STRING) if (xf86getSubToken(&(ptr->va_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Vendor"); Error(QUOTE_MSG, "Vendor");
ptr->va_vendor = xf86_lex_val.str; ptr->va_vendor = xf86_lex_val.str;
break; break;
case BOARD: case BOARD:
if (xf86getSubToken(&(ptr->va_comment)) != STRING) if (xf86getSubToken(&(ptr->va_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Board"); Error(QUOTE_MSG, "Board");
ptr->va_board = xf86_lex_val.str; ptr->va_board = xf86_lex_val.str;
break; break;
case BUSID: case BUSID:
if (xf86getSubToken(&(ptr->va_comment)) != STRING) if (xf86getSubToken(&(ptr->va_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "BusID"); Error(QUOTE_MSG, "BusID");
ptr->va_busid = xf86_lex_val.str; ptr->va_busid = xf86_lex_val.str;
break; break;
case DRIVER: case DRIVER:
if (xf86getSubToken(&(ptr->va_comment)) != STRING) if (xf86getSubToken(&(ptr->va_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "Driver"); Error(QUOTE_MSG, "Driver");
ptr->va_driver = xf86_lex_val.str; ptr->va_driver = xf86_lex_val.str;
break; break;
@ -191,7 +191,7 @@ xf86parseVideoAdaptorSection(void)
ptr->va_option_lst = xf86parseOption(ptr->va_option_lst); ptr->va_option_lst = xf86parseOption(ptr->va_option_lst);
break; break;
case SUBSECTION: case SUBSECTION:
if (xf86getSubToken(&(ptr->va_comment)) != STRING) if (xf86getSubToken(&(ptr->va_comment)) != XF86_TOKEN_STRING)
Error(QUOTE_MSG, "SubSection"); Error(QUOTE_MSG, "SubSection");
{ {
HANDLE_LIST(va_port_lst, xf86parseVideoPortSubSection, HANDLE_LIST(va_port_lst, xf86parseVideoPortSubSection,

2
hw/xfree86/parser/read.c
View File

@ -104,7 +104,7 @@ xf86readConfigFile(void)
xf86_lex_val.str = NULL; xf86_lex_val.str = NULL;
break; break;
case SECTION: case SECTION:
if (xf86getSubToken(&(ptr->conf_comment)) != STRING) { if (xf86getSubToken(&(ptr->conf_comment)) != XF86_TOKEN_STRING) {
xf86parseError(QUOTE_MSG, "Section"); xf86parseError(QUOTE_MSG, "Section");
CLEANUP(ptr); CLEANUP(ptr);
return NULL; return NULL;

4
hw/xfree86/parser/scan.c
View File

@ -395,7 +395,7 @@ xf86getToken(const xf86ConfigSymTabRec * tab)
configRBuf[i] = '\0'; configRBuf[i] = '\0';
xf86_lex_val.str = calloc(1, strlen(configRBuf) + 1); xf86_lex_val.str = calloc(1, strlen(configRBuf) + 1);
strcpy(xf86_lex_val.str, configRBuf); /* private copy ! */ strcpy(xf86_lex_val.str, configRBuf); /* private copy ! */
return STRING; return XF86_TOKEN_STRING;
} }
/* /*
@ -428,7 +428,7 @@ xf86getToken(const xf86ConfigSymTabRec * tab)
if (temp == COMMA || temp == DASH) if (temp == COMMA || temp == DASH)
return temp; return temp;
if (temp == NUMBER || temp == STRING) if (temp == NUMBER || temp == XF86_TOKEN_STRING)
return temp; return temp;
} }

2
hw/xfree86/parser/xf86tokens.h
View File

@ -73,7 +73,7 @@ typedef enum {
/* value type tokens */ /* value type tokens */
NUMBER = 1, NUMBER = 1,
STRING, XF86_TOKEN_STRING,
/* Tokens that can appear in many sections */ /* Tokens that can appear in many sections */
SECTION, SECTION,