Skip to content

N
nx-libs
Commit 39a56dea authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mihai Moldovan
Browse files
Options

Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional changes only

parent 1c7abb05
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 53 deletions
nx-X11/programs/Xserver/record/set.c
View file @ 39a56dea
/* /*
Copyright 1995, 1998 The Open Group Copyright 1995, 1998 The Open Group
...@@ -56,9 +55,7 @@ from The Open Group. ...@@ -56,9 +55,7 @@ from The Open Group.
#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;
...@@ -71,8 +68,7 @@ maxMemberInInterval(pIntervals, nIntervals) ...@@ -71,8 +68,7 @@ maxMemberInInterval(pIntervals, nIntervals)
} }
static void static void
NoopDestroySet(pSet) NoopDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
} }
...@@ -89,16 +85,13 @@ typedef struct { ...@@ -89,16 +85,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;
{ {
free(pSet); free(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;
...@@ -110,10 +103,7 @@ BitVectorIsMemberOfSet(pSet, pm) ...@@ -110,10 +103,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]);
...@@ -159,10 +149,8 @@ BitVectorFindBit(pSet, iterbit, bitval) ...@@ -159,10 +149,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;
...@@ -183,11 +171,8 @@ RecordSetOperations BitVectorNoFreeOperations = { ...@@ -183,11 +171,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;
...@@ -197,11 +182,8 @@ BitVectorSetMemoryRequirements(pIntervals, nIntervals, maxMember, alignment) ...@@ -197,11 +182,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;
...@@ -249,16 +231,13 @@ typedef struct { ...@@ -249,16 +231,13 @@ typedef struct {
} IntervalListSet, *IntervalListSetPtr; } IntervalListSet, *IntervalListSetPtr;
static void static void
IntervalListDestroySet(pSet) IntervalListDestroySet(RecordSetPtr pSet)
RecordSetPtr pSet;
{ {
free(pSet); free(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]);
...@@ -278,10 +257,8 @@ IntervalListIsMemberOfSet(pSet, pm) ...@@ -278,10 +257,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;
...@@ -307,22 +284,16 @@ RecordSetOperations IntervalListNoFreeOperations = { ...@@ -307,22 +284,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;
...@@ -401,11 +372,9 @@ typedef RecordSetPtr (*RecordCreateSetProcPtr)( ...@@ -401,11 +372,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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment