andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: FreeDeviceClass() and friends can be static.

Browse Source
This commit is contained in:
Peter Hutterer 2008-10-31 17:05:40 +10:30
parent 3c3a47d0f5
commit 971aef6441
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
dix/devices.c
View File

@ -659,31 +659,10 @@ InitAndStartDevices()
return Success;
}
_X_EXPORT void
FreeAllDeviceClasses(ClassesPtr classes)
{
if (!classes)
return;
FreeDeviceClass(KeyClass, (pointer)&classes->key);
FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
FreeDeviceClass(ButtonClass, (pointer)&classes->button);
FreeDeviceClass(FocusClass, (pointer)&classes->focus);
FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
}
/**
* Free the given device class and reset the pointer to NULL.
*/
_X_EXPORT void
static void
FreeDeviceClass(int type, pointer *class)
{
if (!(*class))
@ -742,7 +721,8 @@ FreeDeviceClass(int type, pointer *class)
}
*class = NULL;
}
_X_EXPORT void
static void
FreeFeedbackClass(int type, pointer *class)
{
if (!(*class))
@ -828,6 +808,28 @@ FreeFeedbackClass(int type, pointer *class)
}
*class = NULL;
}
static void
FreeAllDeviceClasses(ClassesPtr classes)
{
if (!classes)
return;
FreeDeviceClass(KeyClass, (pointer)&classes->key);
FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
FreeDeviceClass(ButtonClass, (pointer)&classes->button);
FreeDeviceClass(FocusClass, (pointer)&classes->focus);
FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
}
/**
* Close down a device and free all resources.
* Once closed down, the driver will probably not expect you that you'll ever

3
include/input.h
View File

@ -523,9 +523,6 @@ extern int AllocMasterDevice(ClientPtr client,
extern void DeepCopyDeviceClasses(DeviceIntPtr from,
DeviceIntPtr to);
extern void FreeDeviceClass(int type, pointer* class);
extern void FreeFeedbackClass(int type, pointer* class);
extern void FreeAllDeviceClasses(ClassesPtr classes);
extern int EnterLeaveSemaphoresIsset(WindowPtr win);
extern int FocusSemaphoresIsset(WindowPtr win);