Attachment 14888 Details for Bug 14861 – 0001-Compile-warning-fixes.patch

[patch] 0001-Compile-warning-fixes.patch

0001-Compile-warning-fixes.patch (text/plain), 3.58 KB, created by Paulo César Pereira de Andrade on 2008-03-06 12:18:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-06 12:18:21 UTC

Size: 3.58 KB

patch

obsolete

>From daaba273ba536eec4706480f5f044bfc6005b8c7 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Thu, 6 Mar 2008 16:50:03 -0300
>Subject: [PATCH] Compile warning fixes.
>
>Major problem was prototype vmwareInitVideo not matching implementation
>vmwareVideoInit. Remaining are adding an "ansification" of a function
>without arguments, and removing/disabling unused variables/functions.
>---
> src/vmware.c      |    6 ++----
> src/vmware.h      |    2 +-
> src/vmwarectrl.c  |    1 -
> src/vmwarevideo.c |    6 ++----
> 4 files changed, 5 insertions(+), 10 deletions(-)
>
>diff --git a/src/vmware.c b/src/vmware.c
>index 3ea425e..a448dde 100644
>--- a/src/vmware.c
>+++ b/src/vmware.c
>@@ -386,7 +386,7 @@ VMXGetVMwareSvgaId(VMWAREPtr pVMWARE)
>     return SVGA_ID_INVALID;
> }
> 
>-
>+#if !XSERVER_LIBPCIACCESS
> /*
>  *----------------------------------------------------------------------
>  *
>@@ -432,6 +432,7 @@ RewriteTagString(const char *istr, char *ostr, int osize)
> 	*op++ = chr;
>     } while (chr);
> }
>+#endif
> 
> static void
> VMWAREIdentify(int flags)
>@@ -1730,7 +1731,6 @@ static void
> VMWARELeaveVT(int scrnIndex, int flags)
> {
>     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
>-    VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
> 
>     VMWARERestore(pScrn);
> }
>@@ -1760,8 +1760,6 @@ VMwarePciProbe (DriverPtr           drv,
> {
>     ScrnInfoPtr     scrn = NULL;
>     EntityInfoPtr   entity;
>-    /*I830EntPtr	    i830_ent = NULL;*/
>-    DevUnion	    *private;
> 
>     scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets,
>                                NULL, NULL, NULL, NULL, NULL);
>diff --git a/src/vmware.h b/src/vmware.h
>index 7edefd5..609718e 100644
>--- a/src/vmware.h
>+++ b/src/vmware.h
>@@ -269,7 +269,7 @@ void VMwareCtrl_ExtInit(ScrnInfoPtr pScrn);
> void VMwareXinerama_ExtInit(ScrnInfoPtr pScrn);
> 
> /* vmwarevideo.c */
>-Bool vmwareInitVideo(
>+Bool vmwareVideoInit(
>    ScreenPtr pScreen
>    );
> void vmwareVideoEnd(
>diff --git a/src/vmwarectrl.c b/src/vmwarectrl.c
>index dc9e91f..24865d6 100644
>--- a/src/vmwarectrl.c
>+++ b/src/vmwarectrl.c
>@@ -311,7 +311,6 @@ VMwareCtrlSetTopology(ClientPtr client)
>    ExtensionEntry *ext;
>    register int n;
>    xXineramaScreenInfo *extents;
>-   size_t i;
> 
>    REQUEST_AT_LEAST_SIZE(xVMwareCtrlSetTopologyReq);
> 
>diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
>index 6c081c8..6d75a01 100644
>--- a/src/vmwarevideo.c
>+++ b/src/vmwarevideo.c
>@@ -224,7 +224,7 @@ static void vmwareVideoEndStream(ScrnInfoPtr pScrn, VMWAREVideoPtr pVid);
> /*
>  * Offscreen memory manager functions
>  */
>-static void vmwareOffscreenInit();
>+static void vmwareOffscreenInit(void);
> static VMWAREOffscreenPtr vmwareOffscreenAllocate(VMWAREPtr pVMWARE,
>                                                   uint32 size);
> static void vmwareOffscreenFree(VMWAREOffscreenPtr memptr);
>@@ -282,7 +282,7 @@ vmwareCheckVideoSanity(ScrnInfoPtr pScrn)
>  */
> 
> static void
>-vmwareOffscreenInit()
>+vmwareOffscreenInit(void)
> {
>     offscreenMgr.size = 0;
>     offscreenMgr.offset  = 0;
>@@ -415,7 +415,6 @@ Bool vmwareVideoEnabled(VMWAREPtr pVMWARE)
> Bool vmwareVideoInit(ScreenPtr pScreen)
> {
>     ScrnInfoPtr pScrn = infoFromScreen(pScreen);
>-    VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
>     XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
>     XF86VideoAdaptorPtr newAdaptor = NULL;
>     int numAdaptors;
>@@ -615,7 +614,6 @@ static int vmwareVideoInitStream(ScrnInfoPtr pScrn, VMWAREVideoPtr pVid,
>                                  unsigned char *buf, short width, short height)
> {
>     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
>-    ScreenPtr pScreen = pScrn->pScreen;
>     int i;
> 
>     TRACEPOINT
>-- 
>1.5.4.3
>

Actions: View | Splinter Review

Attachments on bug 14861: 14888 | 15856

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.