XFree86 Misc/VidMode: Remove ridiculous debug ErrorFs
When we're building with --enable-debug, don't emit an ErrorF every time a function gets called.
This commit is contained in:
parent
f62277d421
commit
6d59bb5709
|
@ -152,8 +152,6 @@ MiscExtGetMouseSettings(pointer *mouse, char **devname)
|
||||||
{
|
{
|
||||||
mseParamsPtr mseptr;
|
mseParamsPtr mseptr;
|
||||||
|
|
||||||
DEBUG_P("MiscExtGetMouseSettings");
|
|
||||||
|
|
||||||
mseptr = MiscExtCreateStruct(MISC_POINTER);
|
mseptr = MiscExtCreateStruct(MISC_POINTER);
|
||||||
if (!mseptr)
|
if (!mseptr)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -184,8 +182,6 @@ MiscExtGetMouseValue(pointer mouse, MiscExtMseValType valtype)
|
||||||
{
|
{
|
||||||
mseParamsPtr mse = mouse;
|
mseParamsPtr mse = mouse;
|
||||||
|
|
||||||
DEBUG_P("MiscExtGetMouseValue");
|
|
||||||
|
|
||||||
switch (valtype) {
|
switch (valtype) {
|
||||||
case MISC_MSE_PROTO: return mse->type;
|
case MISC_MSE_PROTO: return mse->type;
|
||||||
case MISC_MSE_BAUDRATE: return mse->baudrate;
|
case MISC_MSE_BAUDRATE: return mse->baudrate;
|
||||||
|
@ -205,8 +201,6 @@ MiscExtSetMouseValue(pointer mouse, MiscExtMseValType valtype, int value)
|
||||||
{
|
{
|
||||||
mseParamsPtr mse = mouse;
|
mseParamsPtr mse = mouse;
|
||||||
|
|
||||||
DEBUG_P("MiscExtSetMouseValue");
|
|
||||||
|
|
||||||
switch (valtype) {
|
switch (valtype) {
|
||||||
case MISC_MSE_PROTO:
|
case MISC_MSE_PROTO:
|
||||||
mse->type = value;
|
mse->type = value;
|
||||||
|
@ -251,8 +245,6 @@ MiscExtSetMouseDevice(pointer mouse, char* device)
|
||||||
_X_EXPORT Bool
|
_X_EXPORT Bool
|
||||||
MiscExtGetKbdSettings(pointer *kbd)
|
MiscExtGetKbdSettings(pointer *kbd)
|
||||||
{
|
{
|
||||||
DEBUG_P("MiscExtGetKbdSettings");
|
|
||||||
|
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -290,8 +282,6 @@ MiscExtClientStateCallback(CallbackListPtr *callbacks,
|
||||||
_X_EXPORT int
|
_X_EXPORT int
|
||||||
MiscExtSetGrabKeysState(ClientPtr client, int state)
|
MiscExtSetGrabKeysState(ClientPtr client, int state)
|
||||||
{
|
{
|
||||||
DEBUG_P("MiscExtSetGrabKeysState");
|
|
||||||
|
|
||||||
if (xf86Info.grabInfo.override == NULL ||
|
if (xf86Info.grabInfo.override == NULL ||
|
||||||
xf86Info.grabInfo.override == client) {
|
xf86Info.grabInfo.override == client) {
|
||||||
if (state == 0 && xf86Info.grabInfo.disabled == 0) {
|
if (state == 0 && xf86Info.grabInfo.disabled == 0) {
|
||||||
|
@ -318,8 +308,6 @@ MiscExtSetGrabKeysState(ClientPtr client, int state)
|
||||||
_X_EXPORT pointer
|
_X_EXPORT pointer
|
||||||
MiscExtCreateStruct(MiscExtStructType mse_or_kbd)
|
MiscExtCreateStruct(MiscExtStructType mse_or_kbd)
|
||||||
{
|
{
|
||||||
DEBUG_P("MiscExtCreateStruct");
|
|
||||||
|
|
||||||
switch (mse_or_kbd) {
|
switch (mse_or_kbd) {
|
||||||
case MISC_POINTER:
|
case MISC_POINTER:
|
||||||
{
|
{
|
||||||
|
@ -348,8 +336,6 @@ MiscExtCreateStruct(MiscExtStructType mse_or_kbd)
|
||||||
_X_EXPORT void
|
_X_EXPORT void
|
||||||
MiscExtDestroyStruct(pointer structure, MiscExtStructType mse_or_kbd)
|
MiscExtDestroyStruct(pointer structure, MiscExtStructType mse_or_kbd)
|
||||||
{
|
{
|
||||||
DEBUG_P("MiscExtDestroyStruct");
|
|
||||||
|
|
||||||
switch (mse_or_kbd) {
|
switch (mse_or_kbd) {
|
||||||
case MISC_POINTER:
|
case MISC_POINTER:
|
||||||
case MISC_KEYBOARD:
|
case MISC_KEYBOARD:
|
||||||
|
@ -410,8 +396,6 @@ MiscExtAuthorizeDevice(InputInfoPtr pInfo, char *device)
|
||||||
_X_EXPORT MiscExtReturn
|
_X_EXPORT MiscExtReturn
|
||||||
MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
|
MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
|
||||||
{
|
{
|
||||||
DEBUG_P("MiscExtApply");
|
|
||||||
|
|
||||||
if (mse_or_kbd == MISC_POINTER) {
|
if (mse_or_kbd == MISC_POINTER) {
|
||||||
Bool protoChanged = FALSE;
|
Bool protoChanged = FALSE;
|
||||||
int oldflags;
|
int oldflags;
|
||||||
|
@ -551,8 +535,6 @@ _X_EXPORT Bool
|
||||||
MiscExtGetFilePaths(const char **configfile, const char **modulepath,
|
MiscExtGetFilePaths(const char **configfile, const char **modulepath,
|
||||||
const char **logfile)
|
const char **logfile)
|
||||||
{
|
{
|
||||||
DEBUG_P("MiscExtGetFilePaths");
|
|
||||||
|
|
||||||
*configfile = xf86ConfigFile;
|
*configfile = xf86ConfigFile;
|
||||||
*modulepath = xf86ModulePath;
|
*modulepath = xf86ModulePath;
|
||||||
*logfile = xf86LogFile;
|
*logfile = xf86LogFile;
|
||||||
|
@ -566,8 +548,6 @@ MiscExtPassMessage(int scrnIndex, const char *msgtype, const char *msgval,
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScr = xf86Screens[scrnIndex];
|
ScrnInfoPtr pScr = xf86Screens[scrnIndex];
|
||||||
|
|
||||||
DEBUG_P("MiscExtPassMessage");
|
|
||||||
|
|
||||||
if (*pScr->HandleMessage == NULL)
|
if (*pScr->HandleMessage == NULL)
|
||||||
return BadImplementation;
|
return BadImplementation;
|
||||||
return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr);
|
return (*pScr->HandleMessage)(scrnIndex, msgtype, msgval, retstr);
|
||||||
|
|
|
@ -68,8 +68,6 @@ VidModeExtensionInit(ScreenPtr pScreen)
|
||||||
#ifdef XF86VIDMODE
|
#ifdef XF86VIDMODE
|
||||||
VidModePtr pVidMode;
|
VidModePtr pVidMode;
|
||||||
|
|
||||||
DEBUG_P("VidModeExtensionInit");
|
|
||||||
|
|
||||||
if (!xf86GetVidModeEnabled()) {
|
if (!xf86GetVidModeEnabled()) {
|
||||||
DEBUG_P("!xf86GetVidModeEnabled()");
|
DEBUG_P("!xf86GetVidModeEnabled()");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -109,8 +107,6 @@ VidModeClose(int i, ScreenPtr pScreen)
|
||||||
{
|
{
|
||||||
VidModePtr pVidMode = VMPTR(pScreen);
|
VidModePtr pVidMode = VMPTR(pScreen);
|
||||||
|
|
||||||
DEBUG_P("VidModeClose");
|
|
||||||
|
|
||||||
/* This shouldn't happen */
|
/* This shouldn't happen */
|
||||||
if (!pVidMode)
|
if (!pVidMode)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -132,8 +128,6 @@ VidModeAvailable(int scrnIndex)
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
VidModePtr pVidMode;
|
VidModePtr pVidMode;
|
||||||
|
|
||||||
DEBUG_P("VidModeAvailable");
|
|
||||||
|
|
||||||
if (VidModeIndex < 0) {
|
if (VidModeIndex < 0) {
|
||||||
DEBUG_P("VidModeIndex < 0");
|
DEBUG_P("VidModeIndex < 0");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
@ -159,8 +153,6 @@ VidModeGetCurrentModeline(int scrnIndex, pointer *mode, int *dotClock)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetCurrentModeline");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -176,8 +168,6 @@ VidModeGetDotClock(int scrnIndex, int Clock)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetDotClock");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -193,8 +183,6 @@ VidModeGetNumOfClocks(int scrnIndex, Bool *progClock)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetNumOfClocks");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -214,8 +202,6 @@ VidModeGetClocks(int scrnIndex, int *Clocks)
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetClocks");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -237,8 +223,6 @@ VidModeGetFirstModeline(int scrnIndex, pointer *mode, int *dotClock)
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
VidModePtr pVidMode;
|
VidModePtr pVidMode;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetFirstModeline");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -263,8 +247,6 @@ VidModeGetNextModeline(int scrnIndex, pointer *mode, int *dotClock)
|
||||||
VidModePtr pVidMode;
|
VidModePtr pVidMode;
|
||||||
DisplayModePtr p;
|
DisplayModePtr p;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetNextModeline");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -288,8 +270,6 @@ VidModeDeleteModeline(int scrnIndex, pointer mode)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeDeleteModeline");
|
|
||||||
|
|
||||||
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -303,8 +283,6 @@ VidModeZoomViewport(int scrnIndex, int zoom)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeZoomViewPort");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -318,8 +296,6 @@ VidModeSetViewPort(int scrnIndex, int x, int y)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeSetViewPort");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -341,8 +317,6 @@ VidModeGetViewPort(int scrnIndex, int *x, int *y)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetViewPort");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -359,8 +333,6 @@ VidModeSwitchMode(int scrnIndex, pointer mode)
|
||||||
DisplayModePtr pTmpMode;
|
DisplayModePtr pTmpMode;
|
||||||
Bool retval;
|
Bool retval;
|
||||||
|
|
||||||
DEBUG_P("VidModeSwitchMode");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -381,8 +353,6 @@ VidModeLockZoom(int scrnIndex, Bool lock)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeLockZoom");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -400,8 +370,6 @@ VidModeGetMonitor(int scrnIndex, pointer *monitor)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetMonitor");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -416,8 +384,6 @@ VidModeCheckModeForMonitor(int scrnIndex, pointer mode)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeCheckModeForMonitor");
|
|
||||||
|
|
||||||
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
||||||
return MODE_ERROR;
|
return MODE_ERROR;
|
||||||
|
|
||||||
|
@ -431,8 +397,6 @@ VidModeCheckModeForDriver(int scrnIndex, pointer mode)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeCheckModeForDriver");
|
|
||||||
|
|
||||||
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
||||||
return MODE_ERROR;
|
return MODE_ERROR;
|
||||||
|
|
||||||
|
@ -447,8 +411,6 @@ VidModeSetCrtcForMode(int scrnIndex, pointer mode)
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
DisplayModePtr ScreenModes;
|
DisplayModePtr ScreenModes;
|
||||||
|
|
||||||
DEBUG_P("VidModeSetCrtcForMode");
|
|
||||||
|
|
||||||
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -467,8 +429,6 @@ VidModeAddModeline(int scrnIndex, pointer mode)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeAddModeline");
|
|
||||||
|
|
||||||
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
if ((mode == NULL) || (!VidModeAvailable(scrnIndex)))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -491,8 +451,6 @@ VidModeGetNumOfModes(int scrnIndex)
|
||||||
pointer mode = NULL;
|
pointer mode = NULL;
|
||||||
int dotClock= 0, nummodes = 0;
|
int dotClock= 0, nummodes = 0;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetNumOfModes");
|
|
||||||
|
|
||||||
if (!VidModeGetFirstModeline(scrnIndex, &mode, &dotClock))
|
if (!VidModeGetFirstModeline(scrnIndex, &mode, &dotClock))
|
||||||
return nummodes;
|
return nummodes;
|
||||||
|
|
||||||
|
@ -509,8 +467,6 @@ VidModeSetGamma(int scrnIndex, float red, float green, float blue)
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
Gamma gamma;
|
Gamma gamma;
|
||||||
|
|
||||||
DEBUG_P("VidModeSetGamma");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
@ -529,8 +485,6 @@ VidModeGetGamma(int scrnIndex, float *red, float *green, float *blue)
|
||||||
{
|
{
|
||||||
ScrnInfoPtr pScrn;
|
ScrnInfoPtr pScrn;
|
||||||
|
|
||||||
DEBUG_P("VidModeGetGamma");
|
|
||||||
|
|
||||||
if (!VidModeAvailable(scrnIndex))
|
if (!VidModeAvailable(scrnIndex))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user