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

xf86 parser: convert Error to a varargs macro to clear gcc format warnings 

Previously it always passed a format string with exactly one argument,
using NULL when the format string needed none.   Now pass the right number
of arguments to clear gcc warnings of 'too many arguments for format'.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Alan Coopersmith 2011-12-12 16:49:35 -08:00
parent 7801b3dcd6
commit b79de3f42f
15 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/parser/Configint.h
View File

@ -119,8 +119,8 @@ else\
}\ }\
} }
#define Error(a,b) do { \ #define Error(...) do { \
xf86parseError (a, b); CLEANUP (ptr); return NULL; \ xf86parseError (__VA_ARGS__); CLEANUP (ptr); return NULL; \
} while (0) } while (0)
/* /*

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

@ -64,7 +64,7 @@ xf86parseDRISection (void)
else if (token == NUMBER) else if (token == NUMBER)
ptr->dri_group = val.num; ptr->dri_group = val.num;
else else
Error (GROUP_MSG, NULL); Error (GROUP_MSG);
break; break;
case MODE: case MODE:
if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER) if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)
@ -74,7 +74,7 @@ xf86parseDRISection (void)
ptr->dri_mode = val.num; ptr->dri_mode = val.num;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
case COMMENT: case COMMENT:
ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str); ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);

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

@ -245,7 +245,7 @@ xf86parseDeviceSection (void)
ptr->dev_screen = val.num; ptr->dev_screen = val.num;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -254,7 +254,7 @@ xf86parseDeviceSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Device section parsed\n"); printf ("Device section parsed\n");

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

@ -62,7 +62,7 @@ xf86parseExtensionsSection (void)
ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst); ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
case COMMENT: case COMMENT:
ptr->extensions_comment = ptr->extensions_comment =

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

@ -162,7 +162,7 @@ xf86parseFilesSection (void)
ptr->file_xkbdir = val.str; ptr->file_xkbdir = val.str;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
case OBSOLETE_TOKEN: case OBSOLETE_TOKEN:
xf86parseError (OBSOLETE_MSG, xf86tokenString ()); xf86parseError (OBSOLETE_MSG, xf86tokenString ());

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

@ -160,7 +160,7 @@ xf86parseFlagsSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -440,7 +440,7 @@ xf86parseOption(XF86OptionPtr head)
int token; int token;
if ((token = xf86getSubToken(&comment)) != STRING) { if ((token = xf86getSubToken(&comment)) != STRING) {
xf86parseError(BAD_OPTION_MSG, NULL); xf86parseError(BAD_OPTION_MSG);
free(comment); free(comment);
return head; return head;
} }

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

@ -114,7 +114,7 @@ xf86parseInputSection (void)
ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst); ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -123,7 +123,7 @@ xf86parseInputSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("InputDevice section parsed\n"); printf ("InputDevice section parsed\n");

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

@ -241,7 +241,7 @@ xf86parseInputClassSection(void)
Error(BOOL_MSG, "MatchIsTouchscreen"); Error(BOOL_MSG, "MatchIsTouchscreen");
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error(UNEXPECTED_EOF_MSG, NULL); Error(UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error(INVALID_KEYWORD_MSG, xf86tokenString ()); Error(INVALID_KEYWORD_MSG, xf86tokenString ());
@ -250,7 +250,7 @@ xf86parseInputClassSection(void)
} }
if (!has_ident) if (!has_ident)
Error(NO_IDENT_MSG, NULL); Error(NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf("InputClass section parsed\n"); printf("InputClass section parsed\n");

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

@ -124,7 +124,7 @@ xf86parseLayoutSection (void)
iptr->list.next = NULL; iptr->list.next = NULL;
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free (iptr); free (iptr);
Error (INACTIVE_MSG, NULL); Error (INACTIVE_MSG);
} }
iptr->inactive_device_str = val.str; iptr->inactive_device_str = val.str;
ptr->lay_inactive_lst = (XF86ConfInactivePtr) ptr->lay_inactive_lst = (XF86ConfInactivePtr)
@ -150,7 +150,7 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != STRING) { if (token != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_screen_str = val.str; aptr->adj_screen_str = val.str;
@ -178,7 +178,7 @@ xf86parseLayoutSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
free(aptr); free(aptr);
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
xf86unGetToken (token); xf86unGetToken (token);
@ -199,13 +199,13 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != NUMBER) { if (token != NUMBER) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_y = val.num; aptr->adj_y = val.num;
} else { } else {
if (absKeyword) { if (absKeyword) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} else } else
xf86unGetToken (token); xf86unGetToken (token);
} }
@ -218,7 +218,7 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != STRING) { if (token != STRING) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_refscreen = val.str; aptr->adj_refscreen = val.str;
if (aptr->adj_where == CONF_ADJ_RELATIVE) if (aptr->adj_where == CONF_ADJ_RELATIVE)
@ -226,13 +226,13 @@ xf86parseLayoutSection (void)
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != NUMBER) { if (token != NUMBER) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_x = val.num; aptr->adj_x = val.num;
token = xf86getSubToken(&(ptr->lay_comment)); token = xf86getSubToken(&(ptr->lay_comment));
if (token != NUMBER) { if (token != NUMBER) {
free(aptr); free(aptr);
Error(INVALID_SCR_MSG, NULL); Error(INVALID_SCR_MSG);
} }
aptr->adj_y = val.num; aptr->adj_y = val.num;
} }
@ -244,21 +244,21 @@ xf86parseLayoutSection (void)
/* bottom */ /* bottom */
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_bottom_str = val.str; aptr->adj_bottom_str = val.str;
/* left */ /* left */
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_left_str = val.str; aptr->adj_left_str = val.str;
/* right */ /* right */
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(aptr); free(aptr);
Error (SCREEN_MSG, NULL); Error (SCREEN_MSG);
} }
aptr->adj_right_str = val.str; aptr->adj_right_str = val.str;
@ -276,7 +276,7 @@ xf86parseLayoutSection (void)
iptr->iref_option_lst = NULL; iptr->iref_option_lst = NULL;
if (xf86getSubToken (&(ptr->lay_comment)) != STRING) { if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
free(iptr); free(iptr);
Error (INPUTDEV_MSG, NULL); Error (INPUTDEV_MSG);
} }
iptr->iref_inputdev_str = val.str; iptr->iref_inputdev_str = val.str;
while ((token = xf86getSubToken (&(ptr->lay_comment))) == STRING) while ((token = xf86getSubToken (&(ptr->lay_comment))) == STRING)
@ -293,7 +293,7 @@ xf86parseLayoutSection (void)
ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst); ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -302,7 +302,7 @@ xf86parseLayoutSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Layout section parsed\n"); printf ("Layout section parsed\n");

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

@ -107,7 +107,7 @@ xf86parseModuleSubSection (XF86LoadPtr head, char *name)
ptr->load_opt = xf86parseOption(ptr->load_opt); ptr->load_opt = xf86parseOption(ptr->load_opt);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
xf86parseError (UNEXPECTED_EOF_MSG, NULL); xf86parseError (UNEXPECTED_EOF_MSG);
free(ptr); free(ptr);
return NULL; return NULL;
default: default:
@ -163,7 +163,7 @@ xf86parseModuleSection (void)
xf86parseModuleSubSection (ptr->mod_load_lst, val.str); xf86parseModuleSubSection (ptr->mod_load_lst, val.str);
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());

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

@ -145,52 +145,52 @@ xf86parseModeLine (void)
/* Identifier */ /* Identifier */
if (xf86getSubToken (&(ptr->ml_comment)) != STRING) if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
Error ("ModeLine identifier expected", NULL); Error ("ModeLine identifier expected");
ptr->ml_identifier = val.str; ptr->ml_identifier = val.str;
/* DotClock */ /* DotClock */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine dotclock expected", NULL); Error ("ModeLine dotclock expected");
ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5); ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
/* HDisplay */ /* HDisplay */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine Hdisplay expected", NULL); Error ("ModeLine Hdisplay expected");
ptr->ml_hdisplay = val.num; ptr->ml_hdisplay = val.num;
/* HSyncStart */ /* HSyncStart */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine HSyncStart expected", NULL); Error ("ModeLine HSyncStart expected");
ptr->ml_hsyncstart = val.num; ptr->ml_hsyncstart = val.num;
/* HSyncEnd */ /* HSyncEnd */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine HSyncEnd expected", NULL); Error ("ModeLine HSyncEnd expected");
ptr->ml_hsyncend = val.num; ptr->ml_hsyncend = val.num;
/* HTotal */ /* HTotal */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine HTotal expected", NULL); Error ("ModeLine HTotal expected");
ptr->ml_htotal = val.num; ptr->ml_htotal = val.num;
/* VDisplay */ /* VDisplay */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine Vdisplay expected", NULL); Error ("ModeLine Vdisplay expected");
ptr->ml_vdisplay = val.num; ptr->ml_vdisplay = val.num;
/* VSyncStart */ /* VSyncStart */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine VSyncStart expected", NULL); Error ("ModeLine VSyncStart expected");
ptr->ml_vsyncstart = val.num; ptr->ml_vsyncstart = val.num;
/* VSyncEnd */ /* VSyncEnd */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine VSyncEnd expected", NULL); Error ("ModeLine VSyncEnd expected");
ptr->ml_vsyncend = val.num; ptr->ml_vsyncend = val.num;
/* VTotal */ /* VTotal */
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("ModeLine VTotal expected", NULL); Error ("ModeLine VTotal expected");
ptr->ml_vtotal = val.num; ptr->ml_vtotal = val.num;
token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab); token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);
@ -247,7 +247,7 @@ xf86parseModeLine (void)
ptr->ml_flags |= XF86CONF_VSCAN; ptr->ml_flags |= XF86CONF_VSCAN;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -271,7 +271,7 @@ xf86parseVerboseMode (void)
parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec) parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)
if (xf86getSubToken (&(ptr->ml_comment)) != STRING) if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
Error ("Mode name expected", NULL); Error ("Mode name expected");
ptr->ml_identifier = val.str; ptr->ml_identifier = val.str;
while ((token = xf86getToken (ModeTab)) != ENDMODE) while ((token = xf86getToken (ModeTab)) != ENDMODE)
{ {
@ -290,44 +290,44 @@ xf86parseVerboseMode (void)
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_hdisplay = val.num; ptr->ml_hdisplay = val.num;
else else
Error ("Horizontal display expected", NULL); Error ("Horizontal display expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_hsyncstart = val.num; ptr->ml_hsyncstart = val.num;
else else
Error ("Horizontal sync start expected", NULL); Error ("Horizontal sync start expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_hsyncend = val.num; ptr->ml_hsyncend = val.num;
else else
Error ("Horizontal sync end expected", NULL); Error ("Horizontal sync end expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_htotal = val.num; ptr->ml_htotal = val.num;
else else
Error ("Horizontal total expected", NULL); Error ("Horizontal total expected");
had_htimings = 1; had_htimings = 1;
break; break;
case VTIMINGS: case VTIMINGS:
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vdisplay = val.num; ptr->ml_vdisplay = val.num;
else else
Error ("Vertical display expected", NULL); Error ("Vertical display expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vsyncstart = val.num; ptr->ml_vsyncstart = val.num;
else else
Error ("Vertical sync start expected", NULL); Error ("Vertical sync start expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vsyncend = val.num; ptr->ml_vsyncend = val.num;
else else
Error ("Vertical sync end expected", NULL); Error ("Vertical sync end expected");
if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
ptr->ml_vtotal = val.num; ptr->ml_vtotal = val.num;
else else
Error ("Vertical total expected", NULL); Error ("Vertical total expected");
had_vtimings = 1; had_vtimings = 1;
break; break;
case FLAGS: case FLAGS:
@ -367,10 +367,10 @@ xf86parseVerboseMode (void)
ptr->ml_flags |= XF86CONF_DBLSCAN; ptr->ml_flags |= XF86CONF_DBLSCAN;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error ("Unknown flag string", NULL); Error ("Unknown flag string");
break; break;
} }
token = xf86getSubToken (&(ptr->ml_comment)); token = xf86getSubToken (&(ptr->ml_comment));
@ -379,29 +379,29 @@ xf86parseVerboseMode (void)
break; break;
case HSKEW: case HSKEW:
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("Horizontal skew expected", NULL); Error ("Horizontal skew expected");
ptr->ml_flags |= XF86CONF_HSKEW; ptr->ml_flags |= XF86CONF_HSKEW;
ptr->ml_hskew = val.num; ptr->ml_hskew = val.num;
break; break;
case VSCAN: case VSCAN:
if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER) if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
Error ("Vertical scan count expected", NULL); Error ("Vertical scan count expected");
ptr->ml_flags |= XF86CONF_VSCAN; ptr->ml_flags |= XF86CONF_VSCAN;
ptr->ml_vscan = val.num; ptr->ml_vscan = val.num;
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error ("Unexepcted token in verbose \"Mode\" entry\n", NULL); Error ("Unexepcted token in verbose \"Mode\" entry\n");
} }
} }
if (!had_dotclock) if (!had_dotclock)
Error ("the dotclock is missing", NULL); Error ("the dotclock is missing");
if (!had_htimings) if (!had_htimings)
Error ("the horizontal timings are missing", NULL); Error ("the horizontal timings are missing");
if (!had_vtimings) if (!had_vtimings)
Error ("the vertical timings are missing", NULL); Error ("the vertical timings are missing");
#ifdef DEBUG #ifdef DEBUG
printf ("Verbose Mode parsed\n"); printf ("Verbose Mode parsed\n");
@ -455,19 +455,19 @@ xf86parseMonitorSection (void)
break; break;
case DISPLAYSIZE: case DISPLAYSIZE:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (DISPLAYSIZE_MSG, NULL); Error (DISPLAYSIZE_MSG);
ptr->mon_width = val.realnum; ptr->mon_width = val.realnum;
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (DISPLAYSIZE_MSG, NULL); Error (DISPLAYSIZE_MSG);
ptr->mon_height = val.realnum; ptr->mon_height = val.realnum;
break; break;
case HORIZSYNC: case HORIZSYNC:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (HORIZSYNC_MSG, NULL); Error (HORIZSYNC_MSG);
do { do {
if (ptr->mon_n_hsync >= CONF_MAX_HSYNC) if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
Error ("Sorry. Too many horizontal sync intervals.", NULL); Error ("Sorry. Too many horizontal sync intervals.");
ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum; ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;
switch (token = xf86getSubToken (&(ptr->mon_comment))) switch (token = xf86getSubToken (&(ptr->mon_comment)))
{ {
@ -478,7 +478,7 @@ xf86parseMonitorSection (void)
case DASH: case DASH:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER || if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
(float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo) (float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo)
Error (HORIZSYNC_MSG, NULL); Error (HORIZSYNC_MSG);
ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum; ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum;
if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA) if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
break; break;
@ -501,7 +501,7 @@ HorizDone:
case VERTREFRESH: case VERTREFRESH:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER) if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
Error (VERTREFRESH_MSG, NULL); Error (VERTREFRESH_MSG);
do { do {
ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum; ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum;
switch (token = xf86getSubToken (&(ptr->mon_comment))) switch (token = xf86getSubToken (&(ptr->mon_comment)))
@ -513,7 +513,7 @@ HorizDone:
case DASH: case DASH:
if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER || if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
(float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo) (float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo)
Error (VERTREFRESH_MSG, NULL); Error (VERTREFRESH_MSG);
ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum; ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum;
if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA) if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
break; break;
@ -529,7 +529,7 @@ HorizDone:
goto VertDone; goto VertDone;
} }
if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH) if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)
Error ("Sorry. Too many vertical refresh intervals.", NULL); Error ("Sorry. Too many vertical refresh intervals.");
ptr->mon_n_vrefresh++; ptr->mon_n_vrefresh++;
} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER); } while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
VertDone: VertDone:
@ -539,7 +539,7 @@ VertDone:
case GAMMA: case GAMMA:
if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER ) if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER )
{ {
Error (INVALID_GAMMA_MSG, NULL); Error (INVALID_GAMMA_MSG);
} }
else else
{ {
@ -554,7 +554,7 @@ VertDone:
} }
else else
{ {
Error (INVALID_GAMMA_MSG, NULL); Error (INVALID_GAMMA_MSG);
} }
} }
else else
@ -583,7 +583,7 @@ VertDone:
} }
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ()); xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -594,7 +594,7 @@ VertDone:
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Monitor section parsed\n"); printf ("Monitor section parsed\n");
@ -644,7 +644,7 @@ xf86parseModesSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Modes section parsed\n"); printf ("Modes section parsed\n");

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

@ -184,10 +184,10 @@ xf86parsePointerSection (void)
switch (xf86getToken(ZMapTab)) { switch (xf86getToken(ZMapTab)) {
case NUMBER: case NUMBER:
if (val.num < 0) if (val.num < 0)
Error (ZAXISMAPPING_MSG, NULL); Error (ZAXISMAPPING_MSG);
val1 = val.num; val1 = val.num;
if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) { if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
Error (ZAXISMAPPING_MSG, NULL); Error (ZAXISMAPPING_MSG);
} }
if (asprintf(&s, "%lu %u", val1, val.num) == -1) if (asprintf(&s, "%lu %u", val1, val.num) == -1)
s = NULL; s = NULL;
@ -199,7 +199,7 @@ xf86parsePointerSection (void)
s = strdup("y"); s = strdup("y");
break; break;
default: default:
Error (ZAXISMAPPING_MSG, NULL); Error (ZAXISMAPPING_MSG);
break; break;
} }
ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst, ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
@ -209,7 +209,7 @@ xf86parsePointerSection (void)
case ALWAYSCORE: case ALWAYSCORE:
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());

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

@ -101,18 +101,18 @@ xf86parseDisplaySubSection (void)
break; break;
case VIEWPORT: case VIEWPORT:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIEWPORT_MSG, NULL); Error (VIEWPORT_MSG);
ptr->disp_frameX0 = val.num; ptr->disp_frameX0 = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIEWPORT_MSG, NULL); Error (VIEWPORT_MSG);
ptr->disp_frameY0 = val.num; ptr->disp_frameY0 = val.num;
break; break;
case VIRTUAL: case VIRTUAL:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->disp_virtualX = val.num; ptr->disp_virtualX = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->disp_virtualY = val.num; ptr->disp_virtualY = val.num;
break; break;
case DEPTH: case DEPTH:
@ -132,35 +132,35 @@ xf86parseDisplaySubSection (void)
break; break;
case WEIGHT: case WEIGHT:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WEIGHT_MSG, NULL); Error (WEIGHT_MSG);
ptr->disp_weight.red = val.num; ptr->disp_weight.red = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WEIGHT_MSG, NULL); Error (WEIGHT_MSG);
ptr->disp_weight.green = val.num; ptr->disp_weight.green = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WEIGHT_MSG, NULL); Error (WEIGHT_MSG);
ptr->disp_weight.blue = val.num; ptr->disp_weight.blue = val.num;
break; break;
case BLACK_TOK: case BLACK_TOK:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (BLACK_MSG, NULL); Error (BLACK_MSG);
ptr->disp_black.red = val.num; ptr->disp_black.red = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (BLACK_MSG, NULL); Error (BLACK_MSG);
ptr->disp_black.green = val.num; ptr->disp_black.green = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (BLACK_MSG, NULL); Error (BLACK_MSG);
ptr->disp_black.blue = val.num; ptr->disp_black.blue = val.num;
break; break;
case WHITE_TOK: case WHITE_TOK:
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WHITE_MSG, NULL); Error (WHITE_MSG);
ptr->disp_white.red = val.num; ptr->disp_white.red = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WHITE_MSG, NULL); Error (WHITE_MSG);
ptr->disp_white.green = val.num; ptr->disp_white.green = val.num;
if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER) if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
Error (WHITE_MSG, NULL); Error (WHITE_MSG);
ptr->disp_white.blue = val.num; ptr->disp_white.blue = val.num;
break; break;
case MODES: case MODES:
@ -183,7 +183,7 @@ xf86parseDisplaySubSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -302,10 +302,10 @@ xf86parseScreenSection (void)
break; break;
case VIRTUAL: case VIRTUAL:
if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER) if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->scrn_virtualX = val.num; ptr->scrn_virtualX = val.num;
if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER) if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
Error (VIRTUAL_MSG, NULL); Error (VIRTUAL_MSG);
ptr->scrn_virtualY = val.num; ptr->scrn_virtualY = val.num;
break; break;
case OPTION: case OPTION:
@ -321,7 +321,7 @@ xf86parseScreenSection (void)
} }
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -330,7 +330,7 @@ xf86parseScreenSection (void)
} }
if (!has_ident && !has_driver) if (!has_ident && !has_driver)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Screen section parsed\n"); printf ("Screen section parsed\n");

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

@ -102,7 +102,7 @@ xf86parseVendorSubSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -164,7 +164,7 @@ xf86parseVendorSection (void)
} }
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -174,7 +174,7 @@ xf86parseVendorSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("Vendor section parsed\n"); printf ("Vendor section parsed\n");

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

@ -117,7 +117,7 @@ xf86parseVideoPortSubSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -205,7 +205,7 @@ xf86parseVideoAdaptorSection (void)
break; break;
case EOF_TOKEN: case EOF_TOKEN:
Error (UNEXPECTED_EOF_MSG, NULL); Error (UNEXPECTED_EOF_MSG);
break; break;
default: default:
Error (INVALID_KEYWORD_MSG, xf86tokenString ()); Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@ -214,7 +214,7 @@ xf86parseVideoAdaptorSection (void)
} }
if (!has_ident) if (!has_ident)
Error (NO_IDENT_MSG, NULL); Error (NO_IDENT_MSG);
#ifdef DEBUG #ifdef DEBUG
printf ("VideoAdaptor section parsed\n"); printf ("VideoAdaptor section parsed\n");