xserver: Branch 'master' - 8 commits
Peter Hutterer
whot at kemper.freedesktop.org
Tue Feb 3 16:02:41 PST 2009
config/dbus-core.c | 1 -
dix/devices.c | 2 +-
dix/events.c | 1 -
glx/indirect_dispatch.c | 2 +-
glx/indirect_dispatch_swap.c | 2 +-
hw/xfree86/common/xf86Bus.c | 2 +-
hw/xfree86/common/xf86Events.c | 1 -
hw/xfree86/fbdevhw/fbdevhw.c | 5 ++++-
hw/xfree86/int10/generic.c | 5 +++--
hw/xfree86/modes/xf86RandR12.c | 1 -
xkb/ddxDevBtn.c | 2 +-
xkb/xkbUtils.c | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 7a3ddef3bc27982f3558183c74fc8e365cf2e7fd
Author: Tomas Carnecky <tom at dbservice.com>
Date: Wed Feb 4 00:07:02 2009 +0100
fbdevHWGetRec() doesn't return the private data
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 495d88b..3eee070 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -155,7 +155,10 @@ fbdevHWFreeRec(ScrnInfoPtr pScrn)
int
fbdevHWGetFD(ScrnInfoPtr pScrn)
{
- fbdevHWPtr fPtr = fbdevHWGetRec(pScrn);
+ fbdevHWPtr fPtr;
+
+ fbdevHWGetRec(pScrn);
+ fPtr = FBDEVHWPTR(pScrn);
return fPtr->fd;
}
commit e04d9ab999978995b06f4b702293b96f69b0e8c3
Author: Tomas Carnecky <tom at dbservice.com>
Date: Wed Feb 4 00:08:21 2009 +0100
DBUS_API_SUBJECT_TO_CHANGE is already defined on the command line
dbus-core.c:30:1: warning: "DBUS_API_SUBJECT_TO_CHANGE" redefined
<command-line>: warning: this is the location of the previous definition
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/config/dbus-core.c b/config/dbus-core.c
index b349c6e..4c5e10f 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -27,7 +27,6 @@
#include <dix-config.h>
#endif
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#include <sys/select.h>
commit 9f60d127b5371f2853dcc53903c6ff8c7670ad1b
Author: Tomas Carnecky <tom at dbservice.com>
Date: Wed Feb 4 00:07:40 2009 +0100
Fix "warning: braces around scalar initializer"
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 1f8e4de..69f5152 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -66,7 +66,7 @@ xf86AccessRec AccessNULL = { noopEnableDisable, noopEnableDisable, NULL };
xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL};
-BusRec primaryBus = { BUS_NONE, {{0}}};
+BusRec primaryBus = { BUS_NONE, { 0 } };
static Bool xf86ResAccessEnter = FALSE;
commit a88995dfb88719ae4a03483dc571dbbe83565285
Author: Tomas Carnecky <tom at dbservice.com>
Date: Wed Feb 4 00:03:58 2009 +0100
Make gcc happy: correct third argument of CopyGetMasterEvent()
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 03fb440..aad9661 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -116,7 +116,7 @@ DeviceIntPtr master = NULL;
if (!IsPointerDevice(master))
master = GetPairedDevice(dev->u.master);
- CopyGetMasterEvent(master, dev, &events, masterEvents, count);
+ CopyGetMasterEvent(master, dev, events, masterEvents, count);
}
(*dev->public.processInputProc)((xEventPtr)btn, dev, count);
commit dd3f4e829286e62f4c5c07ee93f9f576876acbf9
Author: Tomas Carnecky <tom at dbservice.com>
Date: Wed Feb 4 00:02:24 2009 +0100
Fix "warning: cast to pointer from integer of different size"
Add parenthesis around the whole expression.
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
index 6547f5d..6665519 100644
--- a/glx/indirect_dispatch.c
+++ b/glx/indirect_dispatch.c
@@ -3743,7 +3743,7 @@ void __glXDisp_ResetMinmax(GLbyte * pc)
void __glXDisp_TexImage3D(GLbyte * pc)
{
const CARD32 ptr_is_null = *(CARD32 *)(pc + 76);
- const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 80);
+ const GLvoid * const pixels = (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
__GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index 0b8c27c..3221c80 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -3879,7 +3879,7 @@ void __glXDispSwap_ResetMinmax(GLbyte * pc)
void __glXDispSwap_TexImage3D(GLbyte * pc)
{
const CARD32 ptr_is_null = *(CARD32 *)(pc + 76);
- const GLvoid * const pixels = (const GLvoid *) (ptr_is_null != 0) ? NULL : (pc + 80);
+ const GLvoid * const pixels = (const GLvoid *) ((ptr_is_null != 0) ? NULL : (pc + 80));
__GLXpixel3DHeader * const hdr = (__GLXpixel3DHeader *)(pc);
CALL_PixelStorei( GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, hdr->swapBytes) );
commit 731a907ac21a753f306b53706f689469cefeb953
Author: Tomas Carnecky <tom at dbservice.com>
Date: Tue Feb 3 23:58:25 2009 +0100
Fix "warning: XXX defined but not used"
generic.c:80: warning: ‘read_legacy_video_BIOS’ defined but not used
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 4808108..9d39e99 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -75,6 +75,7 @@ static void *sysMem = NULL;
* etc.). How do we know that \c pci_device_read_rom will return the
* legacy VGA BIOS image?
*/
+#ifndef _PC
static int
read_legacy_video_BIOS(struct pci_device *dev, unsigned char *Buf)
{
@@ -114,6 +115,7 @@ read_legacy_video_BIOS(struct pci_device *dev, unsigned char *Buf)
return Len;
}
+#endif /* _PC */
xf86Int10InfoPtr
commit bc57efffe654c493ceb62555cccb7926f4a646f1
Author: Tomas Carnecky <tom at dbservice.com>
Date: Tue Feb 3 23:54:53 2009 +0100
Fix "warning: unused variable XXX"
events.c:4614: warning: unused variable ‘kbd’
xkbUtils.c:361: warning: unused variable ‘maxKeysPerMod’
xf86Events.c:409: warning: unused variable ‘ke’
generic.c:131: warning: unused variable ‘cs’
generic.c:130: warning: unused variable ‘size’
xf86RandR12.c:591: warning: unused variable ‘crtc’
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/events.c b/dix/events.c
index 2655312..f1fe3f6 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4611,7 +4611,6 @@ ProcQueryPointer(ClientPtr client)
xQueryPointerReply rep;
WindowPtr pWin, t;
DeviceIntPtr mouse = PickPointer(client);
- DeviceIntPtr kbd = PickKeyboard(client);
SpritePtr pSprite;
int rc;
REQUEST(xResourceReq);
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 50a5bf6..592d4e3 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -406,7 +406,6 @@ static void
xf86ReleaseKeys(DeviceIntPtr pDev)
{
KeyClassPtr keyc;
- xEvent ke;
int i, j, nevents, sigstate;
if (!pDev || !pDev->key)
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 0af7c1b..4808108 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -126,8 +126,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
int screen;
legacyVGARec vga;
-#ifdef _PC
- int size;
+#if 0
CARD32 cs;
#endif
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 83a4f4f..ab39329 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -588,7 +588,6 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
else
{
xf86OutputPtr output = config->output[config->compat_output];
- xf86CrtcPtr crtc = output->crtc;
if (output->conf_monitor &&
(output->conf_monitor->mon_width > 0 &&
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 807c654..98f9fc5 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -358,7 +358,7 @@ KeySymsPtr
XkbGetCoreMap(DeviceIntPtr keybd)
{
register int key,tmp;
-int maxSymsPerKey,maxKeysPerMod, maxGroup1Width;
+int maxSymsPerKey, maxGroup1Width;
XkbDescPtr xkb;
KeySymsPtr syms;
int maxNumberOfGroups;
commit 111fdef74dfc7e288cef675b171b673bf64fe056
Author: Tomas Carnecky <tom at dbservice.com>
Date: Tue Feb 3 21:18:53 2009 +0100
ISO C90: Move declaration to the beginning of the function
devices.c: In function ‘DoChangeKeyboardControl’:
devices.c:1768: warning: ISO C90 forbids mixed declarations and code
Signed-off-by: Tomas Carnecky <tom at dbservice.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/dix/devices.c b/dix/devices.c
index 6578229..4f85c6d 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -1682,6 +1682,7 @@ DoChangeKeyboardControl (ClientPtr client, DeviceIntPtr keybd, XID *vlist,
int key = DO_ALL;
BITS32 index2;
int mask = vmask, i;
+ XkbEventCauseRec cause;
ctrl = keybd->kbdfeed->ctrl;
while (vmask) {
@@ -1765,7 +1766,6 @@ DoChangeKeyboardControl (ClientPtr client, DeviceIntPtr keybd, XID *vlist,
return BadValue;
}
- XkbEventCauseRec cause;
XkbSetCauseCoreReq(&cause,X_ChangeKeyboardControl,client);
XkbSetIndicators(keybd,((led == DO_ALL) ? ~0L : (1L<<(led-1))),
ctrl.leds, &cause);
More information about the xorg-commit
mailing list