diff options
| author | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-03-25 12:27:01 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@benzedrine.nwnk.net> | 2007-03-25 12:27:01 -0400 |
| commit | 9a0f25de7ca3c68af867b38936103d17daa92ac6 (patch) | |
| tree | c218f5b04f879f6342332618dddb96d6d7b7506c /dix | |
| parent | ac2356843e38b3400142bc54b65393c12976fc07 (diff) | |
Static cleanups, dead code deletion.
Diffstat (limited to 'dix')
| -rw-r--r-- | dix/devices.c | 9 | ||||
| -rw-r--r-- | dix/dispatch.c | 4 | ||||
| -rw-r--r-- | dix/events.c | 2 | ||||
| -rw-r--r-- | dix/extension.c | 2 | ||||
| -rw-r--r-- | dix/gc.c | 2 | ||||
| -rw-r--r-- | dix/resource.c | 2 |
6 files changed, 11 insertions, 10 deletions
diff --git a/dix/devices.c b/dix/devices.c index 5996b75cd..f622be756 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -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, diff --git a/dix/dispatch.c b/dix/dispatch.c index 32f67886e..02665edea 100644 --- a/dix/dispatch.c +++ b/dix/dispatch.c @@ -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 diff --git a/dix/events.c b/dix/events.c index 02598a394..e008e3613 100644 --- a/dix/events.c +++ b/dix/events.c @@ -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> diff --git a/dix/extension.c b/dix/extension.c index dc1a76f3a..fb4ee6b95 100644 --- a/dix/extension.c +++ b/dix/extension.c @@ -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; @@ -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) diff --git a/dix/resource.c b/dix/resource.c index 7092b2fdb..a5a7eed80 100644 --- a/dix/resource.c +++ b/dix/resource.c @@ -246,7 +246,7 @@ CreateNewResourceClass() return next; } -ClientResourceRec clientTable[MAXCLIENTS]; +static ClientResourceRec clientTable[MAXCLIENTS]; /***************** * InitClientResources |