Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 61 insertions, 49 deletions

diff --git a/xorg-server/test/list.c b/xorg-server/test/list.c
index 14bc74a08..82d232706 100644
--- a/xorg-server/test/list.c
+++ b/xorg-server/test/list.c
@@ -66,7 +66,7 @@ test_xorg_list_init(void)
 static void
 test_xorg_list_add(void)
 {
-    struct parent parent = {0};
+    struct parent parent = { 0 };
     struct child child[3];
     struct child *c;
 
@@ -76,22 +76,25 @@ test_xorg_list_add(void)
     assert(!xorg_list_is_empty(&parent.children));
 
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[0], sizeof(struct child)) == 0);
 
     /* note: xorg_list_add prepends */
     xorg_list_add(&child[1].node, &parent.children);
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[1], sizeof(struct child)) == 0);
 
     xorg_list_add(&child[2].node, &parent.children);
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[2], sizeof(struct child)) == 0);
 };
 
 static void
 test_xorg_list_append(void)
 {
-    struct parent parent = {0};
+    struct parent parent = { 0 };
     struct child child[3];
     struct child *c;
     int i;
@@ -102,20 +105,26 @@ test_xorg_list_append(void)
     assert(!xorg_list_is_empty(&parent.children));
 
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[0], sizeof(struct child)) == 0);
     c = xorg_list_last_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[0], sizeof(struct child)) == 0);
 
     xorg_list_append(&child[1].node, &parent.children);
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[0], sizeof(struct child)) == 0);
     c = xorg_list_last_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[1], sizeof(struct child)) == 0);
 
     xorg_list_append(&child[2].node, &parent.children);
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[0], sizeof(struct child)) == 0);
     c = xorg_list_last_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[2], sizeof(struct child)) == 0);
 
     i = 0;
@@ -127,7 +136,7 @@ test_xorg_list_append(void)
 static void
 test_xorg_list_del(void)
 {
-    struct parent parent = {0};
+    struct parent parent = { 0 };
     struct child child[3];
     struct child *c;
 
@@ -147,6 +156,7 @@ test_xorg_list_del(void)
     xorg_list_add(&child[1].node, &parent.children);
 
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[1], sizeof(struct child)) == 0);
 
     /* delete first node */
@@ -154,12 +164,14 @@ test_xorg_list_del(void)
     assert(!xorg_list_is_empty(&parent.children));
     assert(xorg_list_is_empty(&child[1].node));
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[0], sizeof(struct child)) == 0);
 
     /* delete last node */
     xorg_list_add(&child[1].node, &parent.children);
     xorg_list_del(&child[0].node);
     c = xorg_list_first_entry(&parent.children, struct child, node);
+
     assert(memcmp(c, &child[1], sizeof(struct child)) == 0);
 
     /* delete list head */
@@ -173,7 +185,7 @@ test_xorg_list_del(void)
 static void
 test_xorg_list_for_each(void)
 {
-    struct parent parent = {0};
+    struct parent parent = { 0 };
     struct child child[3];
     struct child *c;
     int i = 0;
@@ -194,7 +206,7 @@ test_xorg_list_for_each(void)
     assert(xorg_list_is_empty(&parent.children));
 
     xorg_list_for_each_entry(c, &parent.children, node) {
-        assert(0); /* we must not get here */
+        assert(0);              /* we must not get here */
     }
 }
 
@@ -226,29 +238,27 @@ test_nt_list_append(void)
     struct foo *foo = calloc(10, sizeof(struct foo));
     struct foo *item;
 
-    for (item = foo, i = 1; i <= 10; i++, item++)
-    {
-	item->a = i;
-	item->b = i * 2;
-	nt_list_init(item, next);
+    for (item = foo, i = 1; i <= 10; i++, item++) {
+        item->a = i;
+        item->b = i * 2;
+        nt_list_init(item, next);
 
-	if (item != foo)
-	    nt_list_append(item, foo, struct foo, next);
+        if (item != foo)
+            nt_list_append(item, foo, struct foo, next);
     }
 
     /* Test using nt_list_next */
-    for (item = foo, i = 1; i <= 10; i++, item = nt_list_next(item, next))
-    {
-	assert(item->a = i);
-	assert(item->b = i * 2);
+    for (item = foo, i = 1; i <= 10; i++, item = nt_list_next(item, next)) {
+        assert(item->a = i);
+        assert(item->b = i * 2);
     }
 
     /* Test using nt_list_for_each_entry */
     i = 1;
     nt_list_for_each_entry(item, foo, next) {
-	assert(item->a = i);
-	assert(item->b = i * 2);
-	i++;
+        assert(item->a = i);
+        assert(item->b = i * 2);
+        i++;
     }
     assert(i == 11);
 }
@@ -264,27 +274,25 @@ test_nt_list_insert(void)
     foo->b = 20;
     nt_list_init(foo, next);
 
-    for (item = &foo[1], i = 9; i > 0; i--, item++)
-    {
-	item->a = i;
-	item->b = i * 2;
-	nt_list_init(item, next);
-	nt_list_insert(item, foo, struct foo, next);
+    for (item = &foo[1], i = 9; i > 0; i--, item++) {
+        item->a = i;
+        item->b = i * 2;
+        nt_list_init(item, next);
+        nt_list_insert(item, foo, struct foo, next);
     }
 
     /* Test using nt_list_next */
-    for (item = foo, i = 10; i > 0; i--, item = nt_list_next(item, next))
-    {
-	assert(item->a = i);
-	assert(item->b = i * 2);
+    for (item = foo, i = 10; i > 0; i--, item = nt_list_next(item, next)) {
+        assert(item->a = i);
+        assert(item->b = i * 2);
     }
 
     /* Test using nt_list_for_each_entry */
     i = 1;
     nt_list_for_each_entry(item, foo, next) {
-	assert(item->a = i);
-	assert(item->b = i * 2);
-	i++;
+        assert(item->a = i);
+        assert(item->b = i * 2);
+        i++;
     }
     assert(i == 11);
 }
@@ -300,55 +308,58 @@ test_nt_list_delete(void)
 
     nt_list_init(empty_list, next);
     nt_list_del(empty_list, empty_list, struct foo, next);
+
     assert(!empty_list);
 
-    for (item = foo, i = 1; i <= 10; i++, item++)
-    {
-	item->a = i;
-	item->b = i * 2;
-	nt_list_init(item, next);
+    for (item = foo, i = 1; i <= 10; i++, item++) {
+        item->a = i;
+        item->b = i * 2;
+        nt_list_init(item, next);
 
-	if (item != foo)
-	    nt_list_append(item, foo, struct foo, next);
+        if (item != foo)
+            nt_list_append(item, foo, struct foo, next);
     }
 
     i = 0;
     nt_list_for_each_entry(item, foo, next) {
-	i++;
+        i++;
     }
     assert(i == 10);
 
     /* delete last item */
     nt_list_del(&foo[9], foo, struct foo, next);
+
     i = 0;
     nt_list_for_each_entry(item, foo, next) {
-	assert(item->a != 10); /* element 10 is gone now */
-	i++;
+        assert(item->a != 10);  /* element 10 is gone now */
+        i++;
     }
-    assert(i == 9); /* 9 elements left */
+    assert(i == 9);             /* 9 elements left */
 
     /* delete second item */
     nt_list_del(foo->next, foo, struct foo, next);
+
     assert(foo->next->a == 3);
 
     i = 0;
     nt_list_for_each_entry(item, foo, next) {
-	assert(item->a != 10); /* element 10 is gone now */
-	assert(item->a != 2); /* element 2 is gone now */
-	i++;
+        assert(item->a != 10);  /* element 10 is gone now */
+        assert(item->a != 2);   /* element 2 is gone now */
+        i++;
     }
-    assert(i == 8); /* 9 elements left */
+    assert(i == 8);             /* 9 elements left */
 
     item = foo;
     /* delete first item */
     nt_list_del(foo, foo, struct foo, next);
+
     assert(item != foo);
     assert(item->next == NULL);
     assert(foo->a == 3);
     assert(foo->next->a == 4);
 
     nt_list_for_each_entry_safe(item, tmp, foo, next) {
-	nt_list_del(item, foo, struct foo, next);
+        nt_list_del(item, foo, struct foo, next);
     }
 
     assert(!foo);
@@ -357,7 +368,8 @@ test_nt_list_delete(void)
     free(list);
 }
 
-int main(int argc, char** argv)
+int
+main(int argc, char **argv)
 {
     test_xorg_list_init();
     test_xorg_list_add();