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

fix compiler warnings in record/set.c

Browse Source 
(note this only fixed up the function definitions for the static functions
which can not cause any abi incompatibility)
This commit is contained in:
Greg Kroah-Hartman 2006-06-09 11:24:57 -07:00
parent 51489bb5ed
commit caad8b724b
1 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
record/set.c
View File

@ -95,9 +95,7 @@ void *Xcalloc(size)
#include "set.h" #include "set.h"
static int static int
maxMemberInInterval(pIntervals, nIntervals) maxMemberInInterval(RecordSetInterval *pIntervals, int nIntervals)
RecordSetInterval *pIntervals;
int nIntervals;
{ {
int i; int i;
int maxMember = -1; int maxMember = -1;
@ -110,8 +108,7 @@ maxMemberInInterval(pIntervals, nIntervals)
} }
static void static void
NoopDestroySet(pSet) NoopDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
} }
@ -128,16 +125,13 @@ typedef struct {
#define BITS_PER_LONG (sizeof(unsigned long) * 8) #define BITS_PER_LONG (sizeof(unsigned long) * 8)
static void static void
BitVectorDestroySet(pSet) BitVectorDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
xfree(pSet); xfree(pSet);
} }
static unsigned long static unsigned long
BitVectorIsMemberOfSet(pSet, pm) BitVectorIsMemberOfSet(RecordSetPtr pSet, int pm)
RecordSetPtr pSet;
int pm;
{ {
BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet;
unsigned long *pbitvec; unsigned long *pbitvec;
@ -149,10 +143,7 @@ BitVectorIsMemberOfSet(pSet, pm)
static int static int
BitVectorFindBit(pSet, iterbit, bitval) BitVectorFindBit(RecordSetPtr pSet, int iterbit, Bool bitval)
RecordSetPtr pSet;
int iterbit;
Bool bitval;
{ {
BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet; BitVectorSetPtr pbvs = (BitVectorSetPtr)pSet;
unsigned long *pbitvec = (unsigned long *)(&pbvs[1]); unsigned long *pbitvec = (unsigned long *)(&pbvs[1]);
@ -198,10 +189,8 @@ BitVectorFindBit(pSet, iterbit, bitval)
static RecordSetIteratePtr static RecordSetIteratePtr
BitVectorIterateSet(pSet, pIter, pInterval) BitVectorIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter,
RecordSetPtr pSet; RecordSetInterval *pInterval)
RecordSetIteratePtr pIter;
RecordSetInterval *pInterval;
{ {
int iterbit = (int)(long)pIter; int iterbit = (int)(long)pIter;
int b; int b;
@ -222,11 +211,8 @@ RecordSetOperations BitVectorNoFreeOperations = {
NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet }; NoopDestroySet, BitVectorIsMemberOfSet, BitVectorIterateSet };
static int static int
BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) BitVectorSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; int maxMember, int *alignment)
int nIntervals;
int maxMember;
int *alignment;
{ {
int nlongs; int nlongs;
@ -236,11 +222,8 @@ BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment)
} }
static RecordSetPtr static RecordSetPtr
BitVectorCreateSet(pIntervals, nIntervals, pMem, memsize) BitVectorCreateSet(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; void *pMem, int memsize)
int nIntervals;
void *pMem;
int memsize;
{ {
BitVectorSetPtr pbvs; BitVectorSetPtr pbvs;
int i, j; int i, j;
@ -288,16 +271,13 @@ typedef struct {
} IntervalListSet, *IntervalListSetPtr; } IntervalListSet, *IntervalListSetPtr;
static void static void
IntervalListDestroySet(pSet) IntervalListDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
xfree(pSet); xfree(pSet);
} }
static unsigned long static unsigned long
IntervalListIsMemberOfSet(pSet, pm) IntervalListIsMemberOfSet(RecordSetPtr pSet, int pm)
RecordSetPtr pSet;
int pm;
{ {
IntervalListSetPtr prls = (IntervalListSetPtr)pSet; IntervalListSetPtr prls = (IntervalListSetPtr)pSet;
RecordSetInterval *pInterval = (RecordSetInterval *)(&prls[1]); RecordSetInterval *pInterval = (RecordSetInterval *)(&prls[1]);
@ -317,10 +297,8 @@ IntervalListIsMemberOfSet(pSet, pm)
static RecordSetIteratePtr static RecordSetIteratePtr
IntervalListIterateSet(pSet, pIter, pIntervalReturn) IntervalListIterateSet(RecordSetPtr pSet, RecordSetIteratePtr pIter,
RecordSetPtr pSet; RecordSetInterval *pIntervalReturn)
RecordSetIteratePtr pIter;
RecordSetInterval *pIntervalReturn;
{ {
RecordSetInterval *pInterval = (RecordSetInterval *)pIter; RecordSetInterval *pInterval = (RecordSetInterval *)pIter;
IntervalListSetPtr prls = (IntervalListSetPtr)pSet; IntervalListSetPtr prls = (IntervalListSetPtr)pSet;
@ -346,22 +324,16 @@ RecordSetOperations IntervalListNoFreeOperations = {
NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet }; NoopDestroySet, IntervalListIsMemberOfSet, IntervalListIterateSet };
static int static int
IntervalListMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) IntervalListMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; int maxMember, int *alignment)
int nIntervals;
int maxMember;
int *alignment;
{ {
*alignment = sizeof(unsigned long); *alignment = sizeof(unsigned long);
return sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval); return sizeof(IntervalListSet) + nIntervals * sizeof(RecordSetInterval);
} }
static RecordSetPtr static RecordSetPtr
IntervalListCreateSet(pIntervals, nIntervals, pMem, memsize) IntervalListCreateSet(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; void *pMem, int memsize)
int nIntervals;
void *pMem;
int memsize;
{ {
IntervalListSetPtr prls; IntervalListSetPtr prls;
int i, j, k; int i, j, k;
@ -454,11 +426,9 @@ typedef RecordSetPtr (*RecordCreateSetProcPtr)(
); );
static int static int
_RecordSetMemoryRequirements(pIntervals, nIntervals, alignment, ppCreateSet) _RecordSetMemoryRequirements(RecordSetInterval *pIntervals, int nIntervals,
RecordSetInterval *pIntervals; int *alignment,
int nIntervals; RecordCreateSetProcPtr *ppCreateSet)
int *alignment;
RecordCreateSetProcPtr *ppCreateSet;
{ {
int bmsize, rlsize, bma, rla; int bmsize, rlsize, bma, rla;
int maxMember; int maxMember;