xserver: Branch 'master' - 5 commits

[Peter Hutterer]

 dix/events.c    |    2 +-
 dix/window.c    |    3 ---
 include/os.h    |    3 ---
 os/connection.c |    1 -
 xkb/xkb.c       |    4 +++-
 xkb/xkbLEDs.c   |    2 +-
 6 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit d698e62690e0a52fa537f1cd792cab7a5b1bafdf
Author: Maarten Maathuis <madman2003 at gmail.com>
Date:   Thu Mar 19 21:35:25 2009 +0100

    xkb: plug a memory leak in XkbCopySrvLedInfo (#20756)
    
    X.Org Bug 20756 <http://bugs.freedesktop.org/show_bug.cgi?id=20756>
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index c61296b..a70ac84 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -643,7 +643,7 @@ XkbCopySrvLedInfo(	DeviceIntPtr		from,
     else
 	sli_new->fb.lf = lf;
 
-    if (sli_new->flags & XkbSLI_IsDefault) {
+    if (!(sli_new->flags & XkbSLI_IsDefault)) {
 	sli_new->names= _XkbTypedCalloc(XkbNumIndicators,Atom);
 	sli_new->maps= _XkbTypedCalloc(XkbNumIndicators,XkbIndicatorMapRec);
     } /* else sli_new->names/maps is pointing to
commit e26f79335bb7a9ad34fe9b23c283a214202f89ed
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Mar 17 16:22:00 2009 +1000

    xkb: put a few extra checks in against non-keyboards

diff --git a/xkb/xkb.c b/xkb/xkb.c
index ba1a4f6..e7c9a31 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -605,7 +605,7 @@ ProcXkbLatchLockState(ClientPtr client)
 
     for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
         if ((tmpd == dev) || (!tmpd->isMaster && tmpd->u.master == dev)) {
-            if (!tmpd->key->xkbInfo)
+            if (!tmpd->key || !tmpd->key->xkbInfo)
                 continue;
 
             oldState = tmpd->key->xkbInfo->state;
@@ -744,6 +744,8 @@ ProcXkbSetControls(ClientPtr client)
     CHK_MASK_LEGAL(0x01, stuff->changeCtrls, XkbAllControlsMask);
 
     for (tmpd = inputInfo.devices; tmpd; tmpd = tmpd->next) {
+        if (!tmpd->key || !tmpd->key->xkbInfo)
+            continue;
         if ((tmpd == dev) || (!tmpd->isMaster && tmpd->u.master == dev)) {
             xkbi = tmpd->key->xkbInfo;
             ctrl = xkbi->desc->ctrls;
commit 844bb629fe786ecf536039df3f5f4b3b214c9d40
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Mar 19 15:44:34 2009 +1000

    dix: remove a truly useless a = (foo) ? bar : bar; statement.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/events.c b/dix/events.c
index 5702d2f..e73044e 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1680,7 +1680,7 @@ AllowSome(ClientPtr client,
 		{
 		    if (dev == thisDev)
 			continue;
-                    devgrabinfo = (core) ? &dev->deviceGrab : &dev->deviceGrab;
+                    devgrabinfo = &dev->deviceGrab;
 		    if (devgrabinfo->grab
                             && SameClient(devgrabinfo->grab, client))
 			devgrabinfo->sync.state = THAWED;
commit 62183a06e5f72a18abc3d58c4bf5658a20ece217
Author: Tomas Carnecky <tom at dbservice.com>
Date:   Fri Mar 20 16:19:33 2009 +0100

    Remove two unused defines in C files
    
    These two defines were defined in C files but not used anywhere:
    
      dix/window.c      #define DeviceEventMasks (KeyPressMask | [...]
      os/connection.c   #define MAXFD 500
    
    Signed-off-by: Tomas Carnecky <tom at dbservice.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/window.c b/dix/window.c
index e2669f0..f112f81 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -984,9 +984,6 @@ DestroySubwindows(WindowPtr pWin, ClientPtr client)
     return Success;
 }
 
-#define DeviceEventMasks (KeyPressMask | KeyReleaseMask | ButtonPressMask | \
-    ButtonReleaseMask | PointerMotionMask)
-
 /*****
  *  ChangeWindowAttributes
  *   
diff --git a/os/connection.c b/os/connection.c
index 14c91b5..a6270b3 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -172,7 +172,6 @@ int *ConnectionTranslation = NULL;
 #define MAXSOCKS 500
 #undef MAXSELECT
 #define MAXSELECT 500
-#define MAXFD 500
 
 struct _ct_node {
     struct _ct_node *next;
commit 4e0d7cc506b661b5e5cedf8be6e17aa4c8075aa8
Author: Tomas Carnecky <tom at dbservice.com>
Date:   Fri Mar 20 16:19:34 2009 +0100

    FID, whatever that was, isn't anymore
    
    No traces of FID in the xserver nor in the modules listed in
    util/modular/xorg.modules
    
    Signed-off-by: Tomas Carnecky <tom at dbservice.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/include/os.h b/include/os.h
index df5c73a..7da31a5 100644
--- a/include/os.h
+++ b/include/os.h
@@ -52,8 +52,6 @@ SOFTWARE.
 #include "misc.h"
 #include <stdarg.h>
 
-#define NullFID ((FID) 0)
-
 #define SCREEN_SAVER_ON   0
 #define SCREEN_SAVER_OFF  1
 #define SCREEN_SAVER_FORCER 2
@@ -66,7 +64,6 @@ SOFTWARE.
 #define MAX_BIG_REQUEST_SIZE 4194303
 #endif
 
-typedef pointer	FID;
 typedef struct _FontPathRec *FontPathPtr;
 typedef struct _NewClientRec *NewClientPtr;