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

dix: remove valuator_mask_copy_valuators, not needed anymore. 

With the switch to masks internally, this isn't needed anymore.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2010-10-19 10:59:09 +10:00
parent 2b04a3ef73
commit 2362adc2da
2 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dix/inpututils.c
View File

@ -527,31 +527,6 @@ valuator_mask_unset(ValuatorMask *mask, int valuator)
} }
} }
/**
* Copy the valuator data from the given mask and return it as one closed
* array (i.e., with holes where the masks are unset.
* If valuators_in is not NULL, the valuator data will be copied into
* valuators_in. The caller is responsible to allocate enough memory.
*
* Otherwise, memory is allocated and returned.
*/
int*
valuator_mask_copy_valuators(const ValuatorMask *mask, int *valuators_in)
{
int *valuators;
if (!valuators_in)
valuators = calloc(valuator_mask_size(mask), sizeof(int));
else
valuators = valuators_in;
memcpy(valuators, mask->valuators,
valuator_mask_size(mask) * sizeof(int));
return valuators;
}
void void
valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src) valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src)
{ {

1
include/inpututils.h
View File

@ -41,7 +41,6 @@ struct _ValuatorMask {
extern _X_HIDDEN int valuator_mask_size(const ValuatorMask *mask); extern _X_HIDDEN int valuator_mask_size(const ValuatorMask *mask);
extern _X_HIDDEN int valuator_mask_isset(const ValuatorMask *mask, int bit); extern _X_HIDDEN int valuator_mask_isset(const ValuatorMask *mask, int bit);
extern _X_HIDDEN void valuator_mask_unset(ValuatorMask *mask, int bit); extern _X_HIDDEN void valuator_mask_unset(ValuatorMask *mask, int bit);
extern _X_HIDDEN int* valuator_mask_copy_valuators(const ValuatorMask *mask, int *valuators_in);
extern _X_HIDDEN int valuator_mask_num_valuators(const ValuatorMask *mask); extern _X_HIDDEN int valuator_mask_num_valuators(const ValuatorMask *mask);
extern _X_HIDDEN void valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src); extern _X_HIDDEN void valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src);
extern _X_HIDDEN int valuator_mask_get(const ValuatorMask *mask, int valnum); extern _X_HIDDEN int valuator_mask_get(const ValuatorMask *mask, int valnum);