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

Static cleanups, dead code deletion.

This commit is contained in:
Adam Jackson 2007-03-25 12:27:01 -04:00
parent ac2356843e
commit 9a0f25de7c
54 changed files with 187 additions and 482 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Xi/exglobals.h
View File

@ -37,7 +37,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
extern int IReqCode;
extern int BadDevice;
extern int BadEvent;
extern int BadMode;
extern int DeviceBusy;
extern int BadClass;

4
Xi/extinit.c
View File

@ -116,7 +116,7 @@ int ExtEventIndex;
Mask ExtValidMasks[EMASKSIZE];
Mask ExtExclusiveMasks[EMASKSIZE];
struct dev_type
static struct dev_type
{
Atom type;
char *name;
@ -152,7 +152,7 @@ XExtEventInfo EventInfo[32];
int IReqCode = 0;
int BadDevice = 0;
int BadEvent = 1;
static int BadEvent = 1;
int BadMode = 2;
int DeviceBusy = 3;
int BadClass = 4;

2
composite/compalloc.c
View File

@ -48,7 +48,7 @@
#include "compint.h"
void
static void
compReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure)
{
WindowPtr pWin = (WindowPtr) closure;

16
composite/compext.c
View File

@ -50,10 +50,10 @@
#include "compint.h"
static CARD8 CompositeReqCode;
int CompositeClientPrivateIndex;
static int CompositeClientPrivateIndex;
RESTYPE CompositeClientWindowType;
RESTYPE CompositeClientSubwindowsType;
RESTYPE CompositeClientOverlayType;
static RESTYPE CompositeClientOverlayType;
static void deleteCompOverlayClient (CompOverlayClientPtr pOcToDel,
ScreenPtr pScreen);
@ -423,7 +423,7 @@ createOverlayWindow (ScreenPtr pScreen)
return pWin;
}
int
static int
ProcCompositeGetOverlayWindow (ClientPtr client)
{
REQUEST(xCompositeGetOverlayWindowReq);
@ -477,7 +477,7 @@ ProcCompositeGetOverlayWindow (ClientPtr client)
return client->noClientException;
}
int
static int
ProcCompositeReleaseOverlayWindow (ClientPtr client)
{
REQUEST(xCompositeReleaseOverlayWindowReq);
@ -515,7 +515,7 @@ ProcCompositeReleaseOverlayWindow (ClientPtr client)
return client->noClientException;
}
int (*ProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {
static int (*ProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {
ProcCompositeQueryVersion,
ProcCompositeRedirectWindow,
ProcCompositeRedirectSubwindows,
@ -625,7 +625,7 @@ SProcCompositeNameWindowPixmap (ClientPtr client)
return (*ProcCompositeVector[stuff->compositeReqType]) (client);
}
int
static int
SProcCompositeGetOverlayWindow (ClientPtr client)
{
int n;
@ -637,7 +637,7 @@ SProcCompositeGetOverlayWindow (ClientPtr client)
return (*ProcCompositeVector[stuff->compositeReqType]) (client);
}
int
static int
SProcCompositeReleaseOverlayWindow (ClientPtr client)
{
int n;
@ -649,7 +649,7 @@ SProcCompositeReleaseOverlayWindow (ClientPtr client)
return (*ProcCompositeVector[stuff->compositeReqType]) (client);
}
int (*SProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {
static int (*SProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {
SProcCompositeQueryVersion,
SProcCompositeRedirectWindow,
SProcCompositeRedirectSubwindows,

2
composite/compinit.c
View File

@ -51,7 +51,7 @@
int CompScreenPrivateIndex;
int CompWindowPrivateIndex;
int CompSubwindowsPrivateIndex;
int CompGeneration;
static int CompGeneration;
static Bool

15
composite/compint.h
View File

@ -171,9 +171,6 @@ extern RESTYPE CompositeClientSubwindowsType;
* compalloc.c
*/
void
compReportDamage (DamagePtr pDamage, RegionPtr pRegion, void *closure);
Bool
compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update);
@ -292,18 +289,6 @@ compWindowUpdate (WindowPtr pWin);
void
deleteCompOverlayClientsForScreen (ScreenPtr pScreen);
int
ProcCompositeGetOverlayWindow (ClientPtr client);
int
ProcCompositeReleaseOverlayWindow (ClientPtr client);
int
SProcCompositeGetOverlayWindow (ClientPtr client);
int
SProcCompositeReleaseOverlayWindow (ClientPtr client);
WindowPtr
CompositeRealChildHead (WindowPtr pWin);

18
damageext/damageext.c
View File

@ -28,12 +28,12 @@
#include "damageextint.h"
unsigned char DamageReqCode;
int DamageEventBase;
int DamageErrorBase;
int DamageClientPrivateIndex;
RESTYPE DamageExtType;
RESTYPE DamageExtWinType;
static unsigned char DamageReqCode;
static int DamageEventBase;
static int DamageErrorBase;
static int DamageClientPrivateIndex;
static RESTYPE DamageExtType;
static RESTYPE DamageExtWinType;
/* Version of the damage extension supported by the server, as opposed to the
* DAMAGE_* defines from damageproto for what version the proto header
@ -319,7 +319,7 @@ static const int version_requests[] = {
#define NUM_VERSION_REQUESTS (sizeof (version_requests) / sizeof (version_requests[0]))
int (*ProcDamageVector[XDamageNumberRequests])(ClientPtr) = {
static int (*ProcDamageVector[XDamageNumberRequests])(ClientPtr) = {
/*************** Version 1 ******************/
ProcDamageQueryVersion,
ProcDamageCreate,
@ -408,7 +408,7 @@ SProcDamageAdd (ClientPtr client)
return (*ProcDamageVector[stuff->damageReqType]) (client);
}
int (*SProcDamageVector[XDamageNumberRequests])(ClientPtr) = {
static int (*SProcDamageVector[XDamageNumberRequests])(ClientPtr) = {
/*************** Version 1 ******************/
SProcDamageQueryVersion,
SProcDamageCreate,
@ -478,7 +478,7 @@ FreeDamageExtWin (pointer value, XID wid)
return Success;
}
void
static void
SDamageNotifyEvent (xDamageNotifyEvent *from,
xDamageNotifyEvent *to)
{

14
damageext/damageextint.h
View File

@ -44,13 +44,6 @@
#include "damage.h"
#include "xfixes.h"
extern unsigned char DamageReqCode;
extern int DamageEventBase;
extern int DamageErrorBase;
extern int DamageClientPrivateIndex;
extern RESTYPE DamageExtType;
extern RESTYPE DamageExtWinType;
typedef struct _DamageClient {
CARD32 major_version;
CARD32 minor_version;
@ -67,9 +60,6 @@ typedef struct _DamageExt {
XID id;
} DamageExtRec, *DamageExtPtr;
extern int (*ProcDamageVector[/*XDamageNumberRequests*/])(ClientPtr);
extern int (*SProcDamageVector[/*XDamageNumberRequests*/])(ClientPtr);
#define VERIFY_DAMAGEEXT(pDamageExt, rid, client, mode) { \
pDamageExt = SecurityLookupIDByType (client, rid, DamageExtType, mode); \
if (!pDamageExt) { \
@ -78,10 +68,6 @@ extern int (*SProcDamageVector[/*XDamageNumberRequests*/])(ClientPtr);
} \
}
void
SDamageNotifyEvent (xDamageNotifyEvent *from,
xDamageNotifyEvent *to);
void
DamageExtSetCritical (ClientPtr pClient, Bool critical);

17
dbe/midbe.c
View File

@ -59,21 +59,12 @@
#include <stdio.h>
/* DEFINES */
/* TYPEDEFS */
/* GLOBALS */
static int miDbePrivPrivGeneration = 0;
static int miDbeWindowPrivPrivIndex = -1;
RESTYPE dbeDrawableResType;
RESTYPE dbeWindowPrivResType;
int dbeScreenPrivIndex = -1;
int dbeWindowPrivIndex = -1;
static RESTYPE dbeDrawableResType;
static RESTYPE dbeWindowPrivResType;
static int dbeScreenPrivIndex = -1;
static int dbeWindowPrivIndex = -1;
/******************************************************************************

9
dix/devices.c
View File

@ -79,7 +79,8 @@ SOFTWARE.
#include "exglobals.h"
#include "exevents.h"
int CoreDevicePrivatesIndex = 0, CoreDevicePrivatesGeneration = -1;
int CoreDevicePrivatesIndex = 0;
static int CoreDevicePrivatesGeneration = -1;
DeviceIntPtr
AddInputDevice(DeviceProc deviceProc, Bool autoStart)
@ -926,16 +927,16 @@ InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
}
LedCtrl defaultLedControl = {
static LedCtrl defaultLedControl = {
DEFAULT_LEDS, DEFAULT_LEDS_MASK, 0};
BellCtrl defaultBellControl = {
static BellCtrl defaultBellControl = {
DEFAULT_BELL,
DEFAULT_BELL_PITCH,
DEFAULT_BELL_DURATION,
0};
IntegerCtrl defaultIntegerControl = {
static IntegerCtrl defaultIntegerControl = {
DEFAULT_INT_RESOLUTION,
DEFAULT_INT_MIN_VALUE,
DEFAULT_INT_MAX_VALUE,

4
dix/dispatch.c
View File

@ -297,8 +297,8 @@ long SmartScheduleSlice = SMART_SCHEDULE_DEFAULT_INTERVAL;
long SmartScheduleInterval = SMART_SCHEDULE_DEFAULT_INTERVAL;
long SmartScheduleMaxSlice = SMART_SCHEDULE_MAX_SLICE;
long SmartScheduleTime;
ClientPtr SmartLastClient;
int SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1];
static ClientPtr SmartLastClient;
static int SmartLastIndex[SMART_MAX_PRIORITY-SMART_MIN_PRIORITY+1];
int SmartScheduleClient(int *clientReady, int nready);
#ifdef SMART_DEBUG

2
dix/events.c
View File

@ -156,7 +156,7 @@ extern Mask xevieFilters[128];
extern int xevieEventSent;
extern int xevieKBEventSent;
int xeviegrabState = 0;
xEvent *xeviexE;
static xEvent *xeviexE;
#endif
#include <X11/extensions/XIproto.h>

2
dix/extension.c
View File

@ -66,7 +66,7 @@ SOFTWARE.
#define LAST_EVENT 128
#define LAST_ERROR 255
ScreenProcEntry AuxillaryScreenProcs[MAXSCREENS];
static ScreenProcEntry AuxillaryScreenProcs[MAXSCREENS];
static ExtensionEntry **extensions = (ExtensionEntry **)NULL;

2
dix/gc.c
View File

@ -69,7 +69,7 @@ extern FontPtr defaultFont;
static Bool CreateDefaultTile(GCPtr pGC);
unsigned char DefaultDash[2] = {4, 4};
static unsigned char DefaultDash[2] = {4, 4};
_X_EXPORT void
ValidateGC(DrawablePtr pDraw, GC *pGC)

2
dix/resource.c
View File

@ -246,7 +246,7 @@ CreateNewResourceClass()
return next;
}
ClientResourceRec clientTable[MAXCLIENTS];
static ClientResourceRec clientTable[MAXCLIENTS];
/*****************
* InitClientResources

2
hw/xfree86/common/xf86Bus.c
View File

@ -2847,7 +2847,7 @@ xf86IsListSubsetOf(resPtr list, resPtr BaseList)
return TRUE;
}
resPtr
static resPtr
findIntersect(resRange Range, resPtr list)
{
resRange range;

1
hw/xfree86/common/xf86Bus.h
View File

@ -143,7 +143,6 @@ memType ChkConflict(resRange *rgp, resPtr res, xf86State state);
Bool xf86IsSubsetOf(resRange range, resPtr list);
Bool xf86IsListSubsetOf(resPtr list, resPtr BaseList);
resPtr xf86ExtractTypeFromList(resPtr list, unsigned long type);
resPtr findIntersect(resRange Range, resPtr list);
resPtr xf86FindIntersect(resRange Range, resPtr list);
void RemoveOverlaps(resPtr target, resPtr list, Bool pow2Alignment,
Bool useEstimated);

2
hw/xfree86/common/xf86Configure.c
View File

@ -68,7 +68,7 @@ static int nDevToConfig = 0, CurrentDriver;
_X_EXPORT xf86MonPtr ConfiguredMonitor;
Bool xf86DoConfigurePass1 = TRUE;
Bool foundMouse = FALSE;
static Bool foundMouse = FALSE;
#if defined(__UNIXOS2__)
#define DFLT_MOUSE_DEV "mouse$"

4
hw/xfree86/common/xf86Events.c
View File

@ -126,9 +126,9 @@ extern Bool noXkbExtension;
*/
#ifdef USE_VT_SYSREQ
Bool VTSysreqToggle = FALSE;
static Bool VTSysreqToggle = FALSE;
#endif /* !USE_VT_SYSREQ */
Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for
static Bool VTSwitchEnabled = TRUE; /* Allows run-time disabling for
*BSD and for avoiding VT
switches when using the DRI
automatic full screen mode.*/

2
hw/xfree86/common/xf86xv.c
View File

@ -110,7 +110,7 @@ static void xf86XVAdjustFrame(int index, int x, int y, int flags);
static Bool xf86XVInitAdaptors(ScreenPtr, XF86VideoAdaptorPtr*, int);
int XF86XVWindowIndex = -1;
static int XF86XVWindowIndex = -1;
int XF86XvScreenIndex = -1;
static unsigned long XF86XVGeneration = 0;
static unsigned long PortResource = 0;

116
hw/xfree86/loader/loader.c
View File

@ -189,101 +189,6 @@ _LoaderListPop(int handle)
return 0;
}
/*
* _LoaderHandleToName() will return the name of the first module with a
* given handle. This requires getting the last module on the LIFO with
* the given handle.
*/
char *
_LoaderHandleToName(int handle)
{
loaderPtr item = listHead;
loaderPtr aritem = NULL;
loaderPtr lastitem = NULL;
if (handle < 0) {
return "(built-in)";
}
while (item) {
if (item->handle == handle) {
if (strchr(item->name, ':') == NULL)
aritem = item;
else
lastitem = item;
}
item = item->next;
}
if (aritem)
return aritem->name;
if (lastitem)
return lastitem->name;
return 0;
}
/*
* _LoaderHandleToCanonicalName() will return the cname of the first module
* with a given handle. This requires getting the last module on the LIFO with
* the given handle.
*/
char *
_LoaderHandleToCanonicalName(int handle)
{
loaderPtr item = listHead;
loaderPtr lastitem = NULL;
if (handle < 0) {
return "(built-in)";
}
while (item) {
if (item->handle == handle) {
lastitem = item;
}
item = item->next;
}
if (lastitem)
return lastitem->cname;
return NULL;
}
/*
* _LoaderModuleToName() will return the name of the first module with a
* given handle. This requires getting the last module on the LIFO with
* the given handle.
*/
char *
_LoaderModuleToName(int module)
{
loaderPtr item = listHead;
loaderPtr aritem = NULL;
loaderPtr lastitem = NULL;
if (module < 0) {
return "(built-in)";
}
while (item) {
if (item->module == module) {
if (strchr(item->name, ':') == NULL)
aritem = item;
else
lastitem = item;
}
item = item->next;
}
if (aritem)
return aritem->name;
if (lastitem)
return lastitem->name;
return 0;
}
/* These four are just ABI stubs */
_X_EXPORT void
LoaderRefSymbols(const char *sym0, ...)
@ -450,35 +355,14 @@ LoaderUnload(int handle)
return 0;
}
void
LoaderDuplicateSymbol(const char *symbol, const int handle)
{
ErrorF("Duplicate symbol %s in %s\n", symbol,
listHead ? listHead->name : "(built-in)");
ErrorF("Also defined in %s\n", _LoaderHandleToName(handle));
FatalError("Module load failure\n");
}
unsigned long LoaderOptions = 0;
void
LoaderResetOptions(void)
{
LoaderOptions = 0;
}
void
LoaderSetOptions(unsigned long opts)
{
LoaderOptions |= opts;
}
void
LoaderClearOptions(unsigned long opts)
{
LoaderOptions &= ~opts;
}
_X_EXPORT int
LoaderGetABIVersion(const char *abiclass)
{

4
hw/xfree86/loader/loaderProcs.h
View File

@ -97,9 +97,6 @@ void LoadFont(FontModule *);
void UnloadModule(ModuleDescPtr);
void UnloadSubModule(ModuleDescPtr);
void UnloadDriver(ModuleDescPtr);
void FreeModuleDesc(ModuleDescPtr mod);
ModuleDescPtr NewModuleDesc(const char *);
ModuleDescPtr AddSibling(ModuleDescPtr head, ModuleDescPtr new);
void LoaderSetPath(const char *path);
void LoaderSortExtensions(void);
@ -108,7 +105,6 @@ unsigned long LoaderGetModuleVersion(ModuleDescPtr mod);
void LoaderResetOptions(void);
void LoaderSetOptions(unsigned long);
void LoaderClearOptions(unsigned long);
/* Options for LoaderSetOptions */
#define LDR_OPT_ABI_MISMATCH_NONFATAL 0x0001

100
hw/xfree86/loader/loadmod.c
View File

@ -745,6 +745,13 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data,
return TRUE;
}
static ModuleDescPtr
AddSibling(ModuleDescPtr head, ModuleDescPtr new)
{
new->sib = head;
return (new);
}
_X_EXPORT ModuleDescPtr
LoadSubModule(ModuleDescPtr parent, const char *module,
const char **subdirlist, const char **patternlist,
@ -775,35 +782,28 @@ LoadSubModule(ModuleDescPtr parent, const char *module,
return submod;
}
ModuleDescPtr
LoadSubModuleLocal(ModuleDescPtr parent, const char *module,
const char **subdirlist, const char **patternlist,
pointer options, const XF86ModReqInfo * modreq,
int *errmaj, int *errmin)
static ModuleDescPtr
NewModuleDesc(const char *name)
{
ModuleDescPtr submod;
ModuleDescPtr mdp = xalloc(sizeof(ModuleDesc));
xf86MsgVerb(X_INFO, 3, "Loading local sub module \"%s\"\n", module);
if (PathIsAbsolute(module))
{
xf86Msg(X_ERROR,
"LoadSubModule: Absolute module path not permitted: \"%s\"\n",
module);
if (errmaj)
*errmaj = LDR_BADUSAGE;
if (errmin)
*errmin = 0;
return NULL;
if (mdp) {
mdp->child = NULL;
mdp->sib = NULL;
mdp->parent = NULL;
mdp->demand_next = NULL;
mdp->name = xstrdup(name);
mdp->filename = NULL;
mdp->identifier = NULL;
mdp->client_id = 0;
mdp->in_use = 0;
mdp->handle = -1;
mdp->SetupProc = NULL;
mdp->TearDownProc = NULL;
mdp->TearDownData = NULL;
}
submod = doLoadModule(module, NULL, subdirlist, patternlist, options,
modreq, errmaj, errmin, 0);
if (submod && submod != (ModuleDescPtr) 1) {
parent->child = AddSibling(parent->child, submod);
submod->parent = parent;
}
return submod;
return (mdp);
}
_X_EXPORT ModuleDescPtr
@ -1099,26 +1099,12 @@ LoadModule(const char *module, const char *path, const char **subdirlist,
modreq, errmaj, errmin, LD_FLAG_GLOBAL);
}
ModuleDescPtr
LoadDriver(const char *module, const char *path, int handle, pointer options,
int *errmaj, int *errmin)
{
return LoadModule(module, path, NULL, NULL, options, NULL, errmaj,
errmin);
}
void
UnloadModule(ModuleDescPtr mod)
{
UnloadModuleOrDriver(mod);
}
void
UnloadDriver(ModuleDescPtr mod)
{
UnloadModuleOrDriver(mod);
}
static void
UnloadModuleOrDriver(ModuleDescPtr mod)
{
@ -1168,7 +1154,7 @@ UnloadSubModule(ModuleDescPtr mod)
xfree(mod);
}
void
static void
FreeModuleDesc(ModuleDescPtr head)
{
ModuleDescPtr sibs, prev;
@ -1177,7 +1163,7 @@ FreeModuleDesc(ModuleDescPtr head)
return;
/*
* only free it if it's not marked as in use. In use means that it may
* be unloaded someday, and UnloadModule or UnloadDriver will free it
* be unloaded someday, and UnloadModule will free it
*/
if (head->in_use)
return;
@ -1192,38 +1178,6 @@ FreeModuleDesc(ModuleDescPtr head)
}
}
ModuleDescPtr
NewModuleDesc(const char *name)
{
ModuleDescPtr mdp = xalloc(sizeof(ModuleDesc));
if (mdp) {
mdp->child = NULL;
mdp->sib = NULL;
mdp->parent = NULL;
mdp->demand_next = NULL;
mdp->name = xstrdup(name);
mdp->filename = NULL;
mdp->identifier = NULL;
mdp->client_id = 0;
mdp->in_use = 0;
mdp->handle = -1;
mdp->SetupProc = NULL;
mdp->TearDownProc = NULL;
mdp->TearDownData = NULL;
}
return (mdp);
}
ModuleDescPtr
AddSibling(ModuleDescPtr head, ModuleDescPtr new)
{
new->sib = head;
return (new);
}
static void
RemoveChild(ModuleDescPtr child)
{

31
hw/xfree86/parser/DRI.c
View File

@ -48,7 +48,21 @@ static xf86ConfigSymTabRec DRITab[] =
#define CLEANUP xf86freeBuffersList
XF86ConfBuffersPtr
static void
xf86freeBuffersList (XF86ConfBuffersPtr ptr)
{
XF86ConfBuffersPtr prev;
while (ptr) {
TestFree (ptr->buf_flags);
TestFree (ptr->buf_comment);
prev = ptr;
ptr = ptr->list.next;
xf86conffree (prev);
}
}
static XF86ConfBuffersPtr
xf86parseBuffers (void)
{
int token;
@ -169,18 +183,3 @@ xf86freeDRI (XF86ConfDRIPtr ptr)
TestFree (ptr->dri_comment);
xf86conffree (ptr);
}
void
xf86freeBuffersList (XF86ConfBuffersPtr ptr)
{
XF86ConfBuffersPtr prev;
while (ptr) {
TestFree (ptr->buf_flags);
TestFree (ptr->buf_comment);
prev = ptr;
ptr = ptr->list.next;
xf86conffree (prev);
}
}

9
hw/xfree86/parser/Flags.c
View File

@ -441,15 +441,6 @@ xf86uLongToString(unsigned long i)
return s;
}
void
xf86debugListOptions(XF86OptionPtr Options)
{
while (Options) {
ErrorF("Option: %s Value: %s\n",Options->opt_name,Options->opt_val);
Options = Options->list.next;
}
}
XF86OptionPtr
xf86parseOption(XF86OptionPtr head)
{

38
hw/xfree86/parser/Layout.c
View File

@ -382,24 +382,7 @@ xf86printLayoutSection (FILE * cf, XF86ConfLayoutPtr ptr)
}
}
void
xf86freeLayoutList (XF86ConfLayoutPtr ptr)
{
XF86ConfLayoutPtr prev;
while (ptr)
{
TestFree (ptr->lay_identifier);
TestFree (ptr->lay_comment);
xf86freeAdjacencyList (ptr->lay_adjacency_lst);
xf86freeInputrefList (ptr->lay_input_lst);
prev = ptr;
ptr = ptr->list.next;
xf86conffree (prev);
}
}
void
static void
xf86freeAdjacencyList (XF86ConfAdjacencyPtr ptr)
{
XF86ConfAdjacencyPtr prev;
@ -419,7 +402,7 @@ xf86freeAdjacencyList (XF86ConfAdjacencyPtr ptr)
}
void
static void
xf86freeInputrefList (XF86ConfInputrefPtr ptr)
{
XF86ConfInputrefPtr prev;
@ -435,6 +418,23 @@ xf86freeInputrefList (XF86ConfInputrefPtr ptr)
}
void
xf86freeLayoutList (XF86ConfLayoutPtr ptr)
{
XF86ConfLayoutPtr prev;
while (ptr)
{
TestFree (ptr->lay_identifier);
TestFree (ptr->lay_comment);
xf86freeAdjacencyList (ptr->lay_adjacency_lst);
xf86freeInputrefList (ptr->lay_input_lst);
prev = ptr;
ptr = ptr->list.next;
xf86conffree (prev);
}
}
#define CheckScreen(str, ptr)\
if (str[0] != '\0') \
{ \

2
hw/xfree86/parser/Module.c
View File

@ -83,7 +83,7 @@ static xf86ConfigSymTabRec ModuleTab[] =
#define CLEANUP xf86freeModules
XF86LoadPtr
static XF86LoadPtr
xf86parseModuleSubSection (XF86LoadPtr head, char *name)
{
int token;

32
hw/xfree86/parser/Monitor.c
View File

@ -124,7 +124,21 @@ static xf86ConfigSymTabRec ModeTab[] =
#define CLEANUP xf86freeModeLineList
XF86ConfModeLinePtr
static void
xf86freeModeLineList (XF86ConfModeLinePtr ptr)
{
XF86ConfModeLinePtr prev;
while (ptr)
{
TestFree (ptr->ml_identifier);
TestFree (ptr->ml_comment);
prev = ptr;
ptr = ptr->list.next;
xf86conffree (prev);
}
}
static XF86ConfModeLinePtr
xf86parseModeLine (void)
{
int token;
@ -253,7 +267,7 @@ xf86parseModeLine (void)
return (ptr);
}
XF86ConfModeLinePtr
static XF86ConfModeLinePtr
xf86parseVerboseMode (void)
{
int token, token2;
@ -830,20 +844,6 @@ xf86freeModesList (XF86ConfModesPtr ptr)
}
}
void
xf86freeModeLineList (XF86ConfModeLinePtr ptr)
{
XF86ConfModeLinePtr prev;
while (ptr)
{
TestFree (ptr->ml_identifier);
TestFree (ptr->ml_comment);
prev = ptr;
ptr = ptr->list.next;
xf86conffree (prev);
}
}
XF86ConfMonitorPtr
xf86findMonitor (const char *ident, XF86ConfMonitorPtr p)
{

12
hw/xfree86/parser/configProcs.h
View File

@ -49,25 +49,19 @@ int xf86validateInput (XF86ConfigPtr p);
XF86ConfLayoutPtr xf86parseLayoutSection(void);
void xf86printLayoutSection(FILE *cf, XF86ConfLayoutPtr ptr);
void xf86freeLayoutList(XF86ConfLayoutPtr ptr);
void xf86freeAdjacencyList(XF86ConfAdjacencyPtr ptr);
void xf86freeInputrefList(XF86ConfInputrefPtr ptr);
int xf86validateLayout(XF86ConfigPtr p);
/* Module.c */
XF86LoadPtr xf86parseModuleSubSection(XF86LoadPtr head, char *name);
XF86ConfModulePtr xf86parseModuleSection(void);
void xf86printModuleSection(FILE *cf, XF86ConfModulePtr ptr);
XF86LoadPtr xf86addNewLoadDirective(XF86LoadPtr head, char *name, int type, XF86OptionPtr opts);
void xf86freeModules(XF86ConfModulePtr ptr);
/* Monitor.c */
XF86ConfModeLinePtr xf86parseModeLine(void);
XF86ConfModeLinePtr xf86parseVerboseMode(void);
XF86ConfMonitorPtr xf86parseMonitorSection(void);
XF86ConfModesPtr xf86parseModesSection(void);
void xf86printMonitorSection(FILE *cf, XF86ConfMonitorPtr ptr);
void xf86printModesSection(FILE *cf, XF86ConfModesPtr ptr);
void xf86freeMonitorList(XF86ConfMonitorPtr ptr);
void xf86freeModesList(XF86ConfModesPtr ptr);
void xf86freeModeLineList(XF86ConfModeLinePtr ptr);
int xf86validateMonitor(XF86ConfigPtr p, XF86ConfScreenPtr screen);
/* Pointer.c */
XF86ConfInputPtr xf86parsePointerSection(void);
@ -92,24 +86,18 @@ XF86ConfVideoAdaptorPtr xf86parseVideoAdaptorSection(void);
void xf86printVideoAdaptorSection(FILE *cf, XF86ConfVideoAdaptorPtr ptr);
void xf86freeVideoAdaptorList(XF86ConfVideoAdaptorPtr ptr);
void xf86freeVideoPortList(XF86ConfVideoPortPtr ptr);
/* read.c */
int xf86validateConfig(XF86ConfigPtr p);
/* scan.c */
unsigned int xf86strToUL(char *str);
int xf86getToken(xf86ConfigSymTabRec *tab);
int xf86getSubToken(char **comment);
int xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec *tab);
void xf86unGetToken(int token);
char *xf86tokenString(void);
void xf86parseError(char *format, ...);
void xf86parseWarning(char *format, ...);
void xf86validationError(char *format, ...);
void xf86setSection(char *section);
int xf86getStringToken(xf86ConfigSymTabRec *tab);
/* write.c */
/* DRI.c */
XF86ConfBuffersPtr xf86parseBuffers (void);
void xf86freeBuffersList (XF86ConfBuffersPtr ptr);
XF86ConfDRIPtr xf86parseDRISection (void);
void xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr);
void xf86freeDRI (XF86ConfDRIPtr ptr);

38
hw/xfree86/parser/read.c
View File

@ -73,6 +73,25 @@ static xf86ConfigSymTabRec TopLevelTab[] =
#define CLEANUP xf86freeConfig
/*
* This function resolves name references and reports errors if the named
* objects cannot be found.
*/
static int
xf86validateConfig (XF86ConfigPtr p)
{
if (!xf86validateDevice (p))
return FALSE;
if (!xf86validateScreen (p))
return FALSE;
if (!xf86validateInput (p))
return FALSE;
if (!xf86validateLayout (p))
return FALSE;
return (TRUE);
}
XF86ConfigPtr
xf86readConfigFile (void)
{
@ -218,25 +237,6 @@ xf86readConfigFile (void)
#undef CLEANUP
/*
* This function resolves name references and reports errors if the named
* objects cannot be found.
*/
int
xf86validateConfig (XF86ConfigPtr p)
{
if (!xf86validateDevice (p))
return FALSE;
if (!xf86validateScreen (p))
return FALSE;
if (!xf86validateInput (p))
return FALSE;
if (!xf86validateLayout (p))
return FALSE;
return (TRUE);
}
/*
* adds an item to the end of the linked list. Any record whose first field
* is a GenericListRec can be cast to this type and used with this function.

16
hw/xfree86/parser/scan.c
View File

@ -116,7 +116,7 @@ extern char *__XOS2RedirRoot(char *path);
* A portable, but restricted, version of strtoul(). It only understands
* hex, octal, and decimal. But it's good enough for our needs.
*/
unsigned int
static unsigned int
xf86strToUL (char *str)
{
int base = 10;
@ -921,20 +921,6 @@ xf86parseError (char *format,...)
ErrorF ("\n");
}
void
xf86parseWarning (char *format,...)
{
va_list ap;
ErrorF ("Parse warning on line %d of section %s in file %s\n\t",
configLineNo, configSection, configPath);
va_start (ap, format);
VErrorF (format, ap);
va_end (ap);
ErrorF ("\n");
}
void
xf86validationError (char *format,...)
{

1
hw/xfree86/xf4bpp/Makefile.am
View File

@ -20,7 +20,6 @@ libxf4bpp_la_SOURCES = \
ppcPixmap.c \
ppcPntWin.c \
ppcPolyPnt.c \
ppcPolyRec.c \
ppcQuery.c \
ppcRslvC.c \
ppcSetSp.c \

19
hw/xfree86/xf4bpp/offscreen.c
View File

@ -300,25 +300,6 @@ DoMono
}
}
void
xf4bppOffDrawMonoImage( pWin, data, x, y, w, h, fg, alu, planes )
WindowPtr pWin; /* GJA */
unsigned char *data;
int x, y, w, h ;
unsigned long int fg ;
int alu ;
unsigned long int planes;
{
if ( ( alu == GXnoop ) || !( planes &= VGA_ALLPLANES ) )
return ;
DoMono( pWin, w, x, y, (const unsigned char *) data, h,
w, ( ( w + 31 ) & ~31 ) >> 3, h, 0, 0, alu,
(int)planes, (int)fg) ;
}
void
xf4bppOffFillStipple( pWin, pStipple, fg, alu, planes, x, y, w, h, xSrc, ySrc )
WindowPtr pWin; /* GJA */

9
hw/xfree86/xf4bpp/ppcGC.c
View File

@ -90,10 +90,9 @@ SOFTWARE.
| GCFunction | GCPlaneMask | GCFillStyle | GC_CALL_VALIDATE_BIT \
| GCClipXOrigin | GCClipYOrigin | GCClipMask | GCSubwindowMode )
static void xf4bppValidateGC(GCPtr, unsigned long, DrawablePtr);
static void xf4bppDestroyGC(GC *);
/* GJA -- we modified the following function to get rid of
* the records in file vgaData.c
*/
static GCFuncs vgaGCFuncs = {
xf4bppValidateGC,
(void (*)(GCPtr, unsigned long))NoopDDA,
@ -196,7 +195,7 @@ register GCPtr pGC ;
return TRUE ;
}
void
static void
xf4bppDestroyGC( pGC )
register GC *pGC ;
@ -292,7 +291,7 @@ return 0 ;
CT_other ==> pCompositeClip is the pixmap bounding box
*/
void
static void
xf4bppValidateGC( pGC, changes, pDrawable )
GCPtr pGC;
unsigned long changes;

8
hw/xfree86/xf4bpp/xf4bpp.h
View File

@ -149,14 +149,6 @@ void xf4bppTilePixmapFS(
Bool xf4bppCreateGC(
GCPtr
);
void xf4bppDestroyGC(
GC *
);
void xf4bppValidateGC(
GCPtr,
unsigned long,
DrawablePtr
);
/* ppcGetSp.c */
void xf4bppGetSpans(

2
hw/xnest/Display.c
View File

@ -39,7 +39,7 @@ XVisualInfo *xnestVisuals;
int xnestNumVisuals;
int xnestDefaultVisualIndex;
Colormap *xnestDefaultColormaps;
int xnestNumDefaultColormaps;
static int xnestNumDefaultColormaps;
int *xnestDepths;
int xnestNumDepths;
XPixmapFormatValues *xnestPixmapFormats;

2
hw/xnest/Screen.c
View File

@ -49,7 +49,7 @@ Window xnestScreenSaverWindows[MAXSCREENS];
extern void GlxWrapInitVisuals(miInitVisualsProcPtr *);
#endif
int xnestScreenGeneration = -1;
static int xnestScreenGeneration = -1;
ScreenPtr
xnestScreen(Window window)

4
include/globals.h
View File

@ -44,10 +44,6 @@ extern Bool DPMSCapableFlag;
#endif
#ifdef PANORAMIX
extern Bool PanoramiXMapped;
extern Bool PanoramiXVisibilityNotifySent;
extern Bool PanoramiXWindowExposureSent;
extern Bool PanoramiXOneExposeRequest;
extern Bool PanoramiXExtensionDisabledHack;
#endif

2
include/inputstr.h
View File

@ -62,7 +62,7 @@ SOFTWARE.
#define EMASKSIZE MAX_DEVICES
extern int CoreDevicePrivatesIndex, CoreDevicePrivatesGeneration;
extern int CoreDevicePrivatesIndex;
/* Kludge: OtherClients and InputClients must be compatible, see code */

4
mi/mioverlay.c
View File

@ -54,8 +54,8 @@ typedef struct {
} miOverlayScreenRec, *miOverlayScreenPtr;
static unsigned long miOverlayGeneration = 0;
int miOverlayWindowIndex = -1;
int miOverlayScreenIndex = -1;
static int miOverlayWindowIndex = -1;
static int miOverlayScreenIndex = -1;
static void RebuildTree(WindowPtr);
static Bool HasUnderlayChildren(WindowPtr);

2
mi/miscrinit.c
View File

@ -312,7 +312,7 @@ miAllocateGCPrivateIndex()
}
_X_EXPORT int miZeroLineScreenIndex;
unsigned int miZeroLineGeneration = 0;
static unsigned int miZeroLineGeneration = 0;
_X_EXPORT void
miSetZeroLineBias(pScreen, bias)

18
miext/damage/damage.c
View File

@ -72,6 +72,12 @@
#define pixmapDamage(pPixmap) damagePixPriv(pPixmap)
static int damageScrPrivateIndex;
static int damagePixPrivateIndex;
static int damageGCPrivateIndex;
static int damageWinPrivateIndex;
static int damageGeneration;
static DamagePtr *
getDrawableDamageRef (DrawablePtr pDrawable)
{
@ -368,12 +374,12 @@ static void damageChangeClip(GCPtr, int, pointer, int);
static void damageDestroyClip(GCPtr);
static void damageCopyClip(GCPtr, GCPtr);
GCFuncs damageGCFuncs = {
static GCFuncs damageGCFuncs = {
damageValidateGC, damageChangeGC, damageCopyGC, damageDestroyGC,
damageChangeClip, damageDestroyClip, damageCopyClip
};
extern GCOps damageGCOps;
static GCOps damageGCOps;
static Bool
damageCreateGC(GCPtr pGC)
@ -1686,7 +1692,7 @@ damageCopyWindow(WindowPtr pWindow,
wrap (pScrPriv, pScreen, CopyWindow, damageCopyWindow);
}
GCOps damageGCOps = {
static GCOps damageGCOps = {
damageFillSpans, damageSetSpans,
damagePutImage, damageCopyArea,
damageCopyPlane, damagePolyPoint,
@ -1787,12 +1793,6 @@ damageCloseScreen (int i, ScreenPtr pScreen)
return (*pScreen->CloseScreen) (i, pScreen);
}
int damageScrPrivateIndex;
int damagePixPrivateIndex;
int damageGCPrivateIndex;
int damageWinPrivateIndex;
int damageGeneration;
Bool
DamageSetup (ScreenPtr pScreen)
{

6
miext/damage/damagestr.h
View File

@ -82,11 +82,7 @@ typedef struct _damageGCPriv {
GCFuncs *funcs;
} DamageGCPrivRec, *DamageGCPrivPtr;
extern int damageScrPrivateIndex;
extern int damagePixPrivateIndex;
extern int damageGCPrivateIndex;
extern int damageWinPrivateIndex;
/* XXX should move these into damage.c, damageScrPrivateIndex is static */
#define damageGetScrPriv(pScr) \
((DamageScrPrivPtr) (pScr)->devPrivates[damageScrPrivateIndex].ptr)

10
os/connection.c
View File

@ -175,7 +175,7 @@ typedef const char *string;
# include <ucred.h>
#endif
int lastfdesc; /* maximum file descriptor */
static int lastfdesc; /* maximum file descriptor */
fd_set WellKnownConnections; /* Listener mask */
fd_set EnabledDevices; /* mask for input devices that are on */
@ -189,7 +189,7 @@ int MaxClients = 0;
Bool NewOutputPending; /* not yet attempted to write some new output */
Bool AnyClientsWriteBlocked; /* true if some client blocked on write */
Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */
Bool PartialNetwork; /* continue even if unable to bind all addrs */
static Pid_t ParentProcess;
#ifdef __UNIXOS2__
@ -298,9 +298,9 @@ void ClearConnectionTranslation(void)
}
#endif
XtransConnInfo *ListenTransConns = NULL;
int *ListenTransFds = NULL;
int ListenTransCount;
static XtransConnInfo *ListenTransConns = NULL;
static int *ListenTransFds = NULL;
static int ListenTransCount;
static void ErrorConnMax(XtransConnInfo /* trans_conn */);

10
os/io.c
View File

@ -111,11 +111,11 @@ _X_EXPORT CallbackListPtr FlushCallback;
#define ETEST(err) (err == EAGAIN || err == EWOULDBLOCK || err == ENOSPC)
#endif
Bool CriticalOutputPending;
int timesThisConnection = 0;
ConnectionInputPtr FreeInputs = (ConnectionInputPtr)NULL;
ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr)NULL;
OsCommPtr AvailableInput = (OsCommPtr)NULL;
static Bool CriticalOutputPending;
static int timesThisConnection = 0;
static ConnectionInputPtr FreeInputs = (ConnectionInputPtr)NULL;
static ConnectionOutputPtr FreeOutputs = (ConnectionOutputPtr)NULL;
static OsCommPtr AvailableInput = (OsCommPtr)NULL;
#define get_req_len(req,cli) ((cli)->swapped ? \
lswaps((req)->length) : (req)->length)

6
os/osdep.h
View File

@ -234,12 +234,6 @@ extern void ClearConnectionTranslation();
extern Bool NewOutputPending;
extern Bool AnyClientsWriteBlocked;
extern Bool CriticalOutputPending;
extern int timesThisConnection;
extern ConnectionInputPtr FreeInputs;
extern ConnectionOutputPtr FreeOutputs;
extern OsCommPtr AvailableInput;
extern WorkQueuePtr workQueue;

6
os/utils.c
View File

@ -245,10 +245,6 @@ _X_EXPORT Bool noXvExtension = FALSE;
Bool CoreDump;
#ifdef PANORAMIX
Bool PanoramiXVisibilityNotifySent = FALSE;
Bool PanoramiXMapped = FALSE;
Bool PanoramiXWindowExposureSent = FALSE;
Bool PanoramiXOneExposeRequest = FALSE;
Bool PanoramiXExtensionDisabledHack = FALSE;
#endif
@ -271,7 +267,7 @@ long Memory_fail = 0;
#include <stdlib.h> /* for random() */
#endif
char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
static char *dev_tty_from_init = NULL; /* since we need to parse it anyway */
OsSigHandlerPtr
OsSignal(sig, handler)

16
os/xdmcp.c
View File

@ -411,11 +411,11 @@ XdmcpRegisterAuthentication (
* set by the manager of the host to be connected to.
*/
ARRAY8 noAuthenticationName = {(CARD16) 0, (CARD8Ptr) 0};
ARRAY8 noAuthenticationData = {(CARD16) 0, (CARD8Ptr) 0};
ARRAY8Ptr AuthenticationName = &noAuthenticationName;
ARRAY8Ptr AuthenticationData = &noAuthenticationData;
AuthenticationFuncsPtr AuthenticationFuncs;
static ARRAY8 noAuthenticationName = {(CARD16) 0, (CARD8Ptr) 0};
static ARRAY8 noAuthenticationData = {(CARD16) 0, (CARD8Ptr) 0};
static ARRAY8Ptr AuthenticationName = &noAuthenticationName;
static ARRAY8Ptr AuthenticationData = &noAuthenticationData;
static AuthenticationFuncsPtr AuthenticationFuncs;
void
XdmcpSetAuthentication (ARRAY8Ptr name)
@ -547,7 +547,7 @@ XdmcpRegisterAuthorization (char *name, int namelen)
* Register the DisplayClass string
*/
ARRAY8 DisplayClass;
static ARRAY8 DisplayClass;
void
XdmcpRegisterDisplayClass (char *name, int length)
@ -565,7 +565,7 @@ XdmcpRegisterDisplayClass (char *name, int length)
* Register the Manufacturer display ID
*/
ARRAY8 ManufacturerDisplayID;
static ARRAY8 ManufacturerDisplayID;
void
XdmcpRegisterManufacturerDisplayID (char *name, int length)
@ -776,7 +776,7 @@ XdmcpAddHost(
* do the appropriate thing
*/
ARRAY8 UnwillingMessage = { (CARD8) 14, (CARD8 *) "Host unwilling" };
static ARRAY8 UnwillingMessage = { (CARD8) 14, (CARD8 *) "Host unwilling" };
static void
receive_packet(int socketfd)

4
render/animcur.c
View File

@ -87,8 +87,8 @@ static CursorBits animCursorBits = {
empty, empty, 2, 1, 1, 0, 0, 1
};
int AnimCurScreenPrivateIndex = -1;
int AnimCurGeneration;
static int AnimCurScreenPrivateIndex = -1;
static int AnimCurGeneration;
#define IsAnimCur(c) ((c)->bits == &animCursorBits)
#define GetAnimCur(c) ((AnimCurPtr) ((c) + 1))

6
render/glyph.c
View File

@ -77,11 +77,11 @@ static GlyphHashSetRec glyphHashSets[] = {
#define NGLYPHHASHSETS (sizeof(glyphHashSets)/sizeof(glyphHashSets[0]))
const CARD8 glyphDepths[GlyphFormatNum] = { 1, 4, 8, 16, 32 };
static const CARD8 glyphDepths[GlyphFormatNum] = { 1, 4, 8, 16, 32 };
GlyphHashRec globalGlyphs[GlyphFormatNum];
static GlyphHashRec globalGlyphs[GlyphFormatNum];
int globalTotalGlyphPrivateSize = 0;
static int globalTotalGlyphPrivateSize = 0;
static int glyphPrivateCount = 0;

2
render/glyphstr.h
View File

@ -91,8 +91,6 @@ typedef struct _GlyphList {
PictFormatPtr format;
} GlyphListRec, *GlyphListPtr;
extern GlyphHashRec globalGlyphs[GlyphFormatNum];
GlyphHashSetPtr
FindGlyphHashSet (CARD32 filled);

2
render/picture.c
View File

@ -43,7 +43,7 @@
_X_EXPORT int PictureScreenPrivateIndex = -1;
int PictureWindowPrivateIndex;
int PictureGeneration;
static int PictureGeneration;
RESTYPE PictureType;
RESTYPE PictFormatType;
RESTYPE GlyphSetType;

8
xfixes/xfixes.c
View File

@ -1,6 +1,4 @@
/*
* $Id$
*
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -55,10 +53,10 @@
#define SERVER_XFIXES_MAJOR 4
#define SERVER_XFIXES_MINOR 0
unsigned char XFixesReqCode;
static unsigned char XFixesReqCode;
int XFixesEventBase;
int XFixesErrorBase;
int XFixesClientPrivateIndex;
static int XFixesClientPrivateIndex;
static int
ProcXFixesQueryVersion(ClientPtr client)
@ -169,7 +167,7 @@ SProcXFixesQueryVersion(ClientPtr client)
return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
}
int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
/*************** Version 1 ******************/
SProcXFixesQueryVersion,
SProcXFixesChangeSaveSet,

3
xfixes/xfixesint.h
View File

@ -61,9 +61,7 @@
#include "selection.h"
#include "xfixes.h"
extern unsigned char XFixesReqCode;
extern int XFixesEventBase;
extern int XFixesClientPrivateIndex;
typedef struct _XFixesClient {
CARD32 major_version;
@ -73,7 +71,6 @@ typedef struct _XFixesClient {
#define GetXFixesClient(pClient) ((XFixesClientPtr) (pClient)->devPrivates[XFixesClientPrivateIndex].ptr)
extern int (*ProcXFixesVector[XFixesNumberRequests])(ClientPtr);
extern int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr);
/* Initialize extension at server startup time */