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

xfree86: Remove spurious xf86ConfigError 

READABLE.

Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2014-05-02 13:36:13 -04:00
parent 35f0257360
commit ef22655311
1 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
hw/xfree86/common/xf86Config.c
View File

@ -571,25 +571,6 @@ xf86DriverlistFromCompile(void)
return driverlist; return driverlist;
} }
/*
* xf86ConfigError --
* Print a READABLE ErrorMessage!!! All information that is
* available is printed.
*/
static void
_X_ATTRIBUTE_PRINTF(1, 2)
xf86ConfigError(const char *msg, ...)
{
va_list ap;
ErrorF("\nConfig Error:\n");
va_start(ap, msg);
VErrorF(msg, ap);
va_end(ap);
ErrorF("\n");
return;
}
static void static void
configFiles(XF86ConfFilesPtr fileconf) configFiles(XF86ConfFilesPtr fileconf)
{ {
@ -994,9 +975,8 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
ScreenSaverTime = defaultScreenSaverTime = i * MILLI_PER_MIN; ScreenSaverTime = defaultScreenSaverTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError ErrorF("BlankTime value %d outside legal range of 0 - %d minutes\n",
("BlankTime value %d outside legal range of 0 - %d minutes", i, i, MAX_TIME_IN_MIN);
MAX_TIME_IN_MIN);
#ifdef DPMSExtension #ifdef DPMSExtension
i = -1; i = -1;
@ -1004,25 +984,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
DPMSStandbyTime = i * MILLI_PER_MIN; DPMSStandbyTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError ErrorF("StandbyTime value %d outside legal range of 0 - %d minutes\n",
("StandbyTime value %d outside legal range of 0 - %d minutes", i, i, MAX_TIME_IN_MIN);
MAX_TIME_IN_MIN);
i = -1; i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i); xf86GetOptValInteger(FlagOptions, FLAG_DPMS_SUSPENDTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
DPMSSuspendTime = i * MILLI_PER_MIN; DPMSSuspendTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError ErrorF("SuspendTime value %d outside legal range of 0 - %d minutes\n",
("SuspendTime value %d outside legal range of 0 - %d minutes", i, i, MAX_TIME_IN_MIN);
MAX_TIME_IN_MIN);
i = -1; i = -1;
xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i); xf86GetOptValInteger(FlagOptions, FLAG_DPMS_OFFTIME, &i);
if ((i >= 0) && (i < MAX_TIME_IN_MIN)) if ((i >= 0) && (i < MAX_TIME_IN_MIN))
DPMSOffTime = i * MILLI_PER_MIN; DPMSOffTime = i * MILLI_PER_MIN;
else if (i != -1) else if (i != -1)
xf86ConfigError ErrorF("OffTime value %d outside legal range of 0 - %d minutes\n",
("OffTime value %d outside legal range of 0 - %d minutes", i, i, MAX_TIME_IN_MIN);
MAX_TIME_IN_MIN);
#endif #endif
i = -1; i = -1;
@ -1037,7 +1014,7 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
case -1: case -1:
break; break;
default: default:
xf86ConfigError("Pixmap option's value (%d) must be 24 or 32\n", i); ErrorF("Pixmap option's value (%d) must be 24 or 32\n", i);
return FALSE; return FALSE;
} }
if (xf86Pix24 != Pix24DontCare) { if (xf86Pix24 != Pix24DontCare) {
@ -2049,8 +2026,8 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
badgamma = monitorp->gamma.blue; badgamma = monitorp->gamma.blue;
} }
if (badgamma > GAMMA_ZERO) { if (badgamma > GAMMA_ZERO) {
xf86ConfigError("Gamma value %.f is out of range (%.2f - %.1f)\n", ErrorF("Gamma value %.f is out of range (%.2f - %.1f)\n", badgamma,
badgamma, GAMMA_MIN, GAMMA_MAX); GAMMA_MIN, GAMMA_MAX);
return FALSE; return FALSE;
} }
@ -2109,8 +2086,7 @@ configDisplay(DispPtr displayp, XF86ConfDisplayPtr conf_display)
if (conf_display->disp_visual) { if (conf_display->disp_visual) {
displayp->defaultVisual = lookupVisual(conf_display->disp_visual); displayp->defaultVisual = lookupVisual(conf_display->disp_visual);
if (displayp->defaultVisual == -1) { if (displayp->defaultVisual == -1) {
xf86ConfigError("Invalid visual name: \"%s\"", ErrorF("Invalid visual name: \"%s\"\n", conf_display->disp_visual);
conf_display->disp_visual);
return FALSE; return FALSE;
} }
} }