From c08d0308d7e2c48012b0b8bd3651a4371826d483 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 14:14:15 +0200 Subject: Xserver/mi/miarc.c: Initialize dashRemaining with 0 before using it. --- nx-X11/programs/Xserver/mi/miarc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/mi') diff --git a/nx-X11/programs/Xserver/mi/miarc.c b/nx-X11/programs/Xserver/mi/miarc.c index 9c3bcb7ad..fadb42bc5 100644 --- a/nx-X11/programs/Xserver/mi/miarc.c +++ b/nx-X11/programs/Xserver/mi/miarc.c @@ -1920,7 +1920,7 @@ miComputeArcs ( int arcsJoin; int selfJoin; - int iDash = 0, dashRemaining; + int iDash = 0, dashRemaining = 0; int iDashStart = 0, dashRemainingStart = 0, iphaseStart; int startAngle, spanAngle, endAngle, backwards = 0; int prevDashAngle, dashAngle; -- cgit v1.2.3 From 8df1a67b66147848673537625ec81b80be928686 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 14:17:53 +0200 Subject: Xserver/mi/mizerarc.c: Initialize oddPtrs as NULL before using it (in miZeroPolyArc). --- nx-X11/programs/Xserver/mi/mizerarc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs/Xserver/mi') diff --git a/nx-X11/programs/Xserver/mi/mizerarc.c b/nx-X11/programs/Xserver/mi/mizerarc.c index 4b4d724a6..f337d605e 100644 --- a/nx-X11/programs/Xserver/mi/mizerarc.c +++ b/nx-X11/programs/Xserver/mi/mizerarc.c @@ -720,7 +720,7 @@ miZeroPolyArc(pDraw, pGC, narcs, parcs) register int n, maxw = 0; register xArc *arc; register int i; - DDXPointPtr points, pts, oddPts; + DDXPointPtr points, pts, oddPts = NULL; register DDXPointPtr pt; int numPts; Bool dospans; -- cgit v1.2.3 From 89499350173da693a0dfa60101b313a73da60fda Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 29 Jun 2016 14:28:49 +0200 Subject: Xserver: Post-REGION-macros-to-inline-funcs clean-up. --- nx-X11/programs/Xserver/mi/mibstore.c | 5 ----- nx-X11/programs/Xserver/mi/mioverlay.c | 1 - nx-X11/programs/Xserver/mi/miwindow.c | 13 ------------- 3 files changed, 19 deletions(-) (limited to 'nx-X11/programs/Xserver/mi') diff --git a/nx-X11/programs/Xserver/mi/mibstore.c b/nx-X11/programs/Xserver/mi/mibstore.c index 5001eae6f..13415177c 100644 --- a/nx-X11/programs/Xserver/mi/mibstore.c +++ b/nx-X11/programs/Xserver/mi/mibstore.c @@ -2573,11 +2573,9 @@ miBSAllocate(pWin) WindowPtr pWin; { register miBSWindowPtr pBackingStore; - register ScreenPtr pScreen; if (pWin->drawable.pScreen->backingStoreSupport == NotUseful) return; - pScreen = pWin->drawable.pScreen; if (!(pBackingStore = (miBSWindowPtr)pWin->backStorage)) { @@ -2674,9 +2672,6 @@ miBSFree(pWin) WindowPtr pWin; { miBSWindowPtr pBackingStore; - register ScreenPtr pScreen; - - pScreen = pWin->drawable.pScreen; pBackingStore = (miBSWindowPtr)pWin->backStorage; if (pBackingStore) diff --git a/nx-X11/programs/Xserver/mi/mioverlay.c b/nx-X11/programs/Xserver/mi/mioverlay.c index 3a85863ed..1250c2b74 100644 --- a/nx-X11/programs/Xserver/mi/mioverlay.c +++ b/nx-X11/programs/Xserver/mi/mioverlay.c @@ -2029,7 +2029,6 @@ HasUnderlayChildren(WindowPtr pWin) static Bool CollectUnderlayChildrenRegions(WindowPtr pWin, RegionPtr pReg) { - ScreenPtr pScreen = pWin->drawable.pScreen; WindowPtr pChild; miOverlayTreePtr pTree; Bool hasUnderlay; diff --git a/nx-X11/programs/Xserver/mi/miwindow.c b/nx-X11/programs/Xserver/mi/miwindow.c index 9e87e7095..e9e5a39ef 100644 --- a/nx-X11/programs/Xserver/mi/miwindow.c +++ b/nx-X11/programs/Xserver/mi/miwindow.c @@ -275,14 +275,12 @@ miChangeSaveUnder(pWin, first) * Used when pWin was restacked */ { RegionRec rgn; /* Area obscured by saveUnder windows */ - register ScreenPtr pScreen; Bool res; if (!deltaSaveUndersViewable && !numSaveUndersViewable) return FALSE; numSaveUndersViewable += deltaSaveUndersViewable; deltaSaveUndersViewable = 0; - pScreen = pWin->drawable.pScreen; RegionNull(&rgn); res = miCheckSubSaveUnder (pWin->parent, pWin->saveUnder ? first : pWin->nextSib, @@ -368,9 +366,6 @@ miMarkOverlappedWindows(pWin, pFirst, ppLayerWin) register WindowPtr pChild, pLast; Bool anyMarked = FALSE; MarkWindowProcPtr MarkWindow = pWin->drawable.pScreen->MarkWindow; - ScreenPtr pScreen; - - pScreen = pWin->drawable.pScreen; /* single layered systems are easy */ if (ppLayerWin) *ppLayerWin = pWin; @@ -453,11 +448,8 @@ miHandleValidateExposures(pWin) { register WindowPtr pChild; register ValidatePtr val; - ScreenPtr pScreen; WindowExposuresProcPtr WindowExposures; - pScreen = pWin->drawable.pScreen; - pChild = pWin; WindowExposures = pChild->drawable.pScreen->WindowExposures; while (1) @@ -581,12 +573,10 @@ miRecomputeExposures ( register WindowPtr pWin, void * value) /* must conform to VisitWindowProcPtr */ { - register ScreenPtr pScreen; RegionPtr pValid = (RegionPtr)value; if (pWin->valdata) { - pScreen = pWin->drawable.pScreen; /* * compute exposed regions of this window */ @@ -1186,11 +1176,8 @@ miMarkUnrealizedWindow(pChild, pWin, fromConfigure) void miSegregateChildren(WindowPtr pWin, RegionPtr pReg, int depth) { - ScreenPtr pScreen; WindowPtr pChild; - pScreen = pWin->drawable.pScreen; - for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib) { if (pChild->drawable.depth == depth) -- cgit v1.2.3 From b15fc63f4c0c4c741af1255d17907ba3b98b5cf9 Mon Sep 17 00:00:00 2001 From: Tomas Carnecky Date: Tue, 5 Jul 2016 08:16:09 +0200 Subject: Replace INITARGS with void INITARGS was a hardcoded define to void. Since knowing the function signature for your extensions is kinda useful, just replace it with a hardcoded void, but leave the define there for API compatibility. Signed-off-by: Tomas Carnecky Reviewed-by: Daniel Stone Reviewed-by: Cyril Brulebois Reviewed-by: Jamey Sharp Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer Signed-off-by: Keith Packard Backport to nx-libs: Mike Gabriel --- nx-X11/programs/Xserver/mi/miinitext.c | 62 +++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'nx-X11/programs/Xserver/mi') diff --git a/nx-X11/programs/Xserver/mi/miinitext.c b/nx-X11/programs/Xserver/mi/miinitext.c index dcd91c5e0..1b947a784 100644 --- a/nx-X11/programs/Xserver/mi/miinitext.c +++ b/nx-X11/programs/Xserver/mi/miinitext.c @@ -151,7 +151,7 @@ extern Bool noXvExtension; #ifndef XFree86LOADER #define INITARGS void -typedef void (*InitExtension)(INITARGS); +typedef void (*InitExtension)(void); #else /* XFree86Loader */ #include "loaderProcs.h" #endif @@ -183,95 +183,95 @@ typedef void (*InitExtension)(INITARGS); /* FIXME: this whole block of externs should be from the appropriate headers */ #ifdef XTESTEXT1 -extern void XTestExtension1Init(INITARGS); +extern void XTestExtension1Init(void); #endif #ifdef SHAPE -extern void ShapeExtensionInit(INITARGS); +extern void ShapeExtensionInit(void); #endif #ifdef MITSHM -extern void ShmExtensionInit(INITARGS); +extern void ShmExtensionInit(void); #endif #ifdef PANORAMIX -extern void PanoramiXExtensionInit(INITARGS); +extern void PanoramiXExtensionInit(void); #endif #ifdef XINPUT -extern void XInputExtensionInit(INITARGS); +extern void XInputExtensionInit(void); #endif #ifdef XTEST -extern void XTestExtensionInit(INITARGS); +extern void XTestExtensionInit(void); #endif #ifdef BIGREQS -extern void BigReqExtensionInit(INITARGS); +extern void BigReqExtensionInit(void); #endif #ifdef XIDLE -extern void XIdleExtensionInit(INITARGS); +extern void XIdleExtensionInit(void); #endif #ifdef SCREENSAVER -extern void ScreenSaverExtensionInit (INITARGS); +extern void ScreenSaverExtensionInit (void); #endif #ifdef XV -extern void XvExtensionInit(INITARGS); -extern void XvMCExtensionInit(INITARGS); +extern void XvExtensionInit(void); +extern void XvMCExtensionInit(void); #endif #ifdef XSYNC -extern void SyncExtensionInit(INITARGS); +extern void SyncExtensionInit(void); #endif #ifdef XKB -extern void XkbExtensionInit(INITARGS); +extern void XkbExtensionInit(void); #endif #ifdef XCMISC -extern void XCMiscExtensionInit(INITARGS); +extern void XCMiscExtensionInit(void); #endif #ifdef XRECORD -extern void RecordExtensionInit(INITARGS); +extern void RecordExtensionInit(void); #endif #ifdef DBE -extern void DbeExtensionInit(INITARGS); +extern void DbeExtensionInit(void); #endif #ifdef XCSECURITY -extern void SecurityExtensionInit(INITARGS); +extern void SecurityExtensionInit(void); #endif #ifdef XF86BIGFONT -extern void XFree86BigfontExtensionInit(INITARGS); +extern void XFree86BigfontExtensionInit(void); #endif #ifdef GLXEXT #ifndef __DARWIN__ -extern void GlxExtensionInit(INITARGS); +extern void GlxExtensionInit(void); extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); #else -extern void DarwinGlxExtensionInit(INITARGS); +extern void DarwinGlxExtensionInit(void); extern void DarwinGlxWrapInitVisuals(miInitVisualsProcPtr *); #endif #endif #ifdef XF86DRI -extern void XFree86DRIExtensionInit(INITARGS); +extern void XFree86DRIExtensionInit(void); #endif #ifdef DPMSExtension -extern void DPMSExtensionInit(INITARGS); +extern void DPMSExtensionInit(void); #endif #ifdef DPSEXT -extern void DPSExtensionInit(INITARGS); +extern void DPSExtensionInit(void); #endif #ifdef RENDER -extern void RenderExtensionInit(INITARGS); +extern void RenderExtensionInit(void); #endif #ifdef RANDR -extern void RRExtensionInit(INITARGS); +extern void RRExtensionInit(void); #endif #ifdef RES -extern void ResExtensionInit(INITARGS); +extern void ResExtensionInit(void); #endif #ifdef DMXEXT -extern void DMXExtensionInit(INITARGS); +extern void DMXExtensionInit(void); #endif #ifdef XFIXES -extern void XFixesExtensionInit(INITARGS); +extern void XFixesExtensionInit(void); #endif #ifdef DAMAGE -extern void DamageExtensionInit(INITARGS); +extern void DamageExtensionInit(void); #endif #ifdef COMPOSITE -extern void CompositeExtensionInit(INITARGS); +extern void CompositeExtensionInit(void); #endif /* The following is only a small first step towards run-time -- cgit v1.2.3