xserver: Branch 'master' - 14 commits
Eamon Walsh
ewalsh at kemper.freedesktop.org
Fri Jun 13 20:03:34 PDT 2008
Xext/xevie.c | 1 +
Xi/chdevhier.c | 2 +-
Xi/gtmotion.c | 2 +-
dix/devices.c | 1 +
dix/getevents.c | 4 ++--
fb/fbwindow.c | 2 +-
hw/xfree86/dixmods/extmod/modinit.h | 4 ++++
mi/mipointer.c | 2 ++
os/connection.c | 2 ++
os/rpcauth.c | 1 +
os/xdmauth.c | 14 ++++++++------
randr/randrstr.h | 5 +++++
xkb/XKBMisc.c | 2 +-
xkb/xkbEvents.c | 9 ++++-----
14 files changed, 34 insertions(+), 17 deletions(-)
New commits:
commit 5544c51447f551dfc6df64438873a7ce64743976
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 22:49:47 2008 -0400
Fix "warning: the address of ‘newTypes’ will always evaluate as ‘true’".
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index 85415a4..eb5c381 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -473,7 +473,7 @@ register int i;
int width,nOldGroups,oldWidth,newTypes[XkbNumKbdGroups];
if ((!xkb) || (!XkbKeycodeInRange(xkb,key)) || (!xkb->map) ||
- (!xkb->map->types)||(!newTypes)||((groups&XkbAllGroupsMask)==0)||
+ (!xkb->map->types)||((groups&XkbAllGroupsMask)==0)||
(nGroups>XkbNumKbdGroups)) {
return BadMatch;
}
commit 2391c409a2840d61fed93832650c0d6c82ebebdf
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 22:48:17 2008 -0400
Fix "warning: unused variable `s'".
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 6389b90..047efcd 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -882,14 +882,13 @@ XkbSrvInfoPtr xkbi;
((xE[i].u.u.type==KeyPress)||(xE[i].u.u.type==KeyRelease)||
(xE[i].u.u.type==DeviceKeyPress)||
(xE[i].u.u.type == DeviceKeyRelease))) {
- XkbStatePtr s= &xkbi->state;
DebugF("[xkb] XKbFilterWriteEvents (non-XKB):\n");
DebugF("[xkb] event= 0x%04x\n",xE[i].u.keyButtonPointer.state);
- DebugF("[xkb] lookup= 0x%02x, grab= 0x%02x\n",s->lookup_mods,
- s->grab_mods);
+ DebugF("[xkb] lookup= 0x%02x, grab= 0x%02x\n",xkbi->state.lookup_mods,
+ xkbi->state.grab_mods);
DebugF("[xkb] compat lookup= 0x%02x, grab= 0x%02x\n",
- s->compat_lookup_mods,
- s->compat_grab_mods);
+ xkbi->state.compat_lookup_mods,
+ xkbi->state.compat_grab_mods);
}
if ( (type>=KeyPress)&&(type<=MotionNotify) ) {
CARD16 old,new;
commit 61dafe384a88fc397d7cd55cb23f4fdc3fb0645c
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 22:47:10 2008 -0400
Fix "warning: unused variable `tsize'".
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index ce1312e..8fa0cca 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -95,7 +95,7 @@ ProcXGetDeviceMotionEvents(ClientPtr client)
INT32 *coords = NULL, *bufptr;
xGetDeviceMotionEventsReply rep;
unsigned long i;
- int rc, num_events, axes, size = 0, tsize;
+ int rc, num_events, axes, size = 0;
unsigned long nEvents;
DeviceIntPtr dev;
TimeStamp start, stop;
commit 37a64b02df02d42a19d4b777930dc5e457d97d63
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 22:41:58 2008 -0400
Fix "warning: ‘rc’ may be used uninitialized in this function".
diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
index 99957fe..07bd729 100644
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@@ -80,7 +80,7 @@ ProcXChangeDeviceHierarchy(ClientPtr client)
xAnyHierarchyChangeInfo *any;
int required_len = sizeof(xChangeDeviceHierarchyReq);
char n;
- int rc;
+ int rc = Success;
int nchanges = 0;
deviceHierarchyChangedEvent ev;
commit e90fcd8294fe763c97610d39cab50f2836f87dca
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 22:26:43 2008 -0400
Fix "warning: no previous prototype for ‘miRROutputGetProperty’".
diff --git a/randr/randrstr.h b/randr/randrstr.h
index 62d4bbf..bd7c7c5 100644
--- a/randr/randrstr.h
+++ b/randr/randrstr.h
@@ -419,6 +419,11 @@ miRROutputSetProperty (ScreenPtr pScreen,
RRPropertyValuePtr value);
Bool
+miRROutputGetProperty (ScreenPtr pScreen,
+ RROutputPtr output,
+ Atom property);
+
+Bool
miRROutputValidateMode (ScreenPtr pScreen,
RROutputPtr output,
RRModePtr mode);
commit 0b00bbca5df140edbfaffab627bd82165f1b1420
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 22:22:22 2008 -0400
Fix "Warning: no previous prototype for `SecureRPCInit'".
diff --git a/os/rpcauth.c b/os/rpcauth.c
index 3451ac1..1e134ad 100644
--- a/os/rpcauth.c
+++ b/os/rpcauth.c
@@ -42,6 +42,7 @@ from The Open Group.
#include <X11/Xauth.h>
#include "misc.h"
#include "os.h"
+#include "osdep.h"
#include "dixstruct.h"
#include <rpc/rpc.h>
commit 1c2f038d69605b0ed1067e47dc75ca6f216991f5
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:59:09 2008 -0400
Fix multiple warnings in os/xdmauth.c.
diff --git a/os/xdmauth.c b/os/xdmauth.c
index d143dde..8cbcd58 100644
--- a/os/xdmauth.c
+++ b/os/xdmauth.c
@@ -69,7 +69,7 @@ XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData,
{
XdmAuthKeyPtr incoming;
- XdmcpUnwrap (incomingData->data, &privateKey,
+ XdmcpUnwrap (incomingData->data, (unsigned char *)&privateKey,
incomingData->data,incomingData->length);
if (packet_type == ACCEPT) {
if (incomingData->length != 8)
@@ -89,7 +89,8 @@ XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData,
outgoingData->data = 0;
if (packet_type == REQUEST) {
if (XdmcpAllocARRAY8 (outgoingData, 8))
- XdmcpWrap (&rho, &privateKey, outgoingData->data, 8);
+ XdmcpWrap ((unsigned char *)&rho, (unsigned char *)&privateKey,
+ outgoingData->data, 8);
}
return TRUE;
}
@@ -99,7 +100,8 @@ XdmAuthenticationAddAuth (int name_len, char *name,
int data_len, char *data)
{
Bool ret;
- XdmcpUnwrap (data, (unsigned char *)&privateKey, data, data_len);
+ XdmcpUnwrap ((unsigned char *)data, (unsigned char *)&privateKey,
+ (unsigned char *)data, data_len);
authFromXDMCP = TRUE;
ret = AddAuthorization (name_len, name, data_len, data);
authFromXDMCP = FALSE;
@@ -152,7 +154,7 @@ XdmAuthenticationInit (char *cookie, int cookie_len)
}
XdmcpGenerateKey (&rho);
XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
- (unsigned char *)&rho,
+ (char *)&rho,
sizeof (rho),
(ValidatorFunc)XdmAuthenticationValidator,
(GeneratorFunc)XdmAuthenticationGenerator,
@@ -387,7 +389,7 @@ XdmCheckCookie (unsigned short cookie_length, char *cookie,
if (!plain)
return (XID) -1;
for (auth = xdmAuth; auth; auth=auth->next) {
- XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length);
+ XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL)
{
client->next = xdmClients;
@@ -432,7 +434,7 @@ XdmToID (unsigned short cookie_length, char *cookie)
if (!plain)
return (XID) -1;
for (auth = xdmAuth; auth; auth=auth->next) {
- XdmcpUnwrap (cookie, (unsigned char *)&auth->key, plain, cookie_length);
+ XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL)
{
xfree (client);
commit 384ebe02b354bf1ad0a2ac25e4b5290f2e795ea1
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:49:01 2008 -0400
Fix "warning: label ‘done’ defined but not used".
diff --git a/os/connection.c b/os/connection.c
index 38521e6..ba16044 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -757,7 +757,9 @@ ClientAuthorized(ClientPtr client,
}
}
priv->auth_id = auth_id;
+#ifdef HAVE_LAUNCHD
done:
+#endif
priv->conn_time = 0;
#ifdef XDMCP
commit 720e44f9730b9e275579483c2a34b16bba77e146
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:42:37 2008 -0400
Fix "warning: no previous prototype for ‘XevieExtensionInit’".
diff --git a/Xext/xevie.c b/Xext/xevie.c
index 277b93b..a5b1837 100644
--- a/Xext/xevie.c
+++ b/Xext/xevie.c
@@ -55,6 +55,7 @@ of the copyright holder.
#include <xkbsrv.h>
#include "../os/osdep.h"
+#include "modinit.h"
#define NoSuchEvent 0x80000000
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 7282e6e..32f7ed4 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -112,6 +112,10 @@ extern void SELinuxExtensionInit(INITARGS);
#include "xselinux.h"
#endif
+#ifdef XEVIE
+extern void XevieExtensionInit(INITARGS);
+#endif
+
#if 1
extern void SecurityExtensionInit(INITARGS);
#endif
commit 9d871e19c9dee5d3ee7f123249e8890417d83093
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:35:29 2008 -0400
Fix "warning: unused variable ‘pDev’, `pPointer'".
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 8b673f4..4763e12 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -126,8 +126,10 @@ miPointerInitialize (ScreenPtr pScreen,
static Bool
miPointerCloseScreen (int index, ScreenPtr pScreen)
{
+#if 0
miPointerPtr pPointer;
DeviceIntPtr pDev;
+#endif
SetupScreen(pScreen);
commit 60f64af075e8ac3e63586452f2f3d338a05785f0
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:23:31 2008 -0400
Fix "warning: passing argument 1 of 'pixman_fill' from incompatible pointer type".
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index f6fe8aa..9bde927 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -227,7 +227,7 @@ fbFillRegionSolid (DrawablePtr pDrawable,
while (n--)
{
#ifndef FB_ACCESS_WRAPPER
- if (!try_mmx || !pixman_fill (dst, dstStride, dstBpp,
+ if (!try_mmx || !pixman_fill ((uint32_t *)dst, dstStride, dstBpp,
pbox->x1 + dstXoff, pbox->y1 + dstYoff,
(pbox->x2 - pbox->x1),
(pbox->y2 - pbox->y1),
commit c448460fdc23262f2b711a32599090c85c70447a
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:05:26 2008 -0400
Fix "warning: pointer targets in assignment differ in signedness".
diff --git a/dix/getevents.c b/dix/getevents.c
index b9e0220..5227c54 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -277,7 +277,7 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
int size;
int dflt;
AxisInfo from, *to; /* for scaling */
- CARD32 *ocbuf, *icbuf; /* pointer to coordinates for copying */
+ INT32 *ocbuf, *icbuf; /* pointer to coordinates for copying */
INT16 *corebuf;
AxisInfo core_axis = {0};
commit 17ed6242e73c5f733601b15732ab30c23acf14d2
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:03:17 2008 -0400
Fix "warning: assignment from incompatible pointer type".
diff --git a/dix/getevents.c b/dix/getevents.c
index fc07496..b9e0220 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -295,7 +295,7 @@ GetMotionHistory(DeviceIntPtr pDev, xTimecoord **buff, unsigned long start,
*buff = xalloc(size * pDev->valuator->numMotionEvents);
if (!(*buff))
return 0;
- obuff = *buff;
+ obuff = (char *)*buff;
for (i = pDev->valuator->first_motion;
i != pDev->valuator->last_motion;
commit 02a8b118cd07d98f12aab8325d8443125703ba7d
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Fri Jun 13 21:01:50 2008 -0400
Fix "warning: implicit declaration of function ‘miPointerGetScreen’".
diff --git a/dix/devices.c b/dix/devices.c
index c83f2fc..b88d856 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -76,6 +76,7 @@ SOFTWARE.
#include "dispatch.h"
#include "swaprep.h"
#include "dixevents.h"
+#include "mipointer.h"
#include <X11/extensions/XI.h>
#include <X11/extensions/XIproto.h>
More information about the xorg-commit
mailing list