svn merge -r588:HEAD ^/branches/released .

1 files changed, 120 insertions, 120 deletions

diff --git a/xorg-server/hw/xquartz/xpr/x-hook.c b/xorg-server/hw/xquartz/xpr/x-hook.c
index 5b850fe88..c65b6fc68 100644
--- a/xorg-server/hw/xquartz/xpr/x-hook.c
+++ b/xorg-server/hw/xquartz/xpr/x-hook.c
@@ -1,120 +1,120 @@
-/* x-hook.c
-
-   Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "x-hook.h"
-#include <stdlib.h>
-#include <assert.h>
-#include "os.h"
-
-#define CELL_NEW(f,d) X_PFX (list_prepend) ((x_list *) (f), (d))
-#define CELL_FREE(c)  X_PFX (list_free_1) (c)
-#define CELL_FUN(c)   ((x_hook_function *) ((c)->next))
-#define CELL_DATA(c)  ((c)->data)
-
-X_EXTERN x_list *
-X_PFX (hook_add) (x_list *lst, x_hook_function *fun, void *data)
-{
-    return X_PFX (list_prepend) (lst, CELL_NEW (fun, data));
-}
-
-X_EXTERN x_list *
-X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data)
-{
-    x_list *node, *cell;
-    x_list *to_delete = NULL;
-
-    for (node = lst; node != NULL; node = node->next)
-    {
-	cell = node->data;
-	if (CELL_FUN (cell) == fun && CELL_DATA (cell) == data)
-	    to_delete = X_PFX (list_prepend) (to_delete, cell);
-    }
-
-    for (node = to_delete; node != NULL; node = node->next)
-    {
-	cell = node->data;
-	lst = X_PFX (list_remove) (lst, cell);
-	CELL_FREE (cell);
-    }
-
-    X_PFX (list_free) (to_delete);
-    return lst;
-}
-
-X_EXTERN void
-X_PFX (hook_run) (x_list *lst, void *arg)
-{
-    x_list *node, *cell;
-    x_hook_function **fun;
-    void **data;
-    int length, i;
-
-    if(!lst)
-        return;
-
-    length = X_PFX (list_length) (lst);
-    fun = xalloc (sizeof (x_hook_function *) * length);
-    data = xalloc (sizeof (void *) * length);
-
-    if(!fun || !data) {
-        FatalError("Failed to allocate memory in %s\n", __func__);
-    }
-    
-    for (i = 0, node = lst; node != NULL; node = node->next, i++)
-    {
-	cell = node->data;
-	fun[i] = CELL_FUN (cell);
-	data[i] = CELL_DATA (cell);
-    }
-
-    for (i = 0; i < length; i++)
-    {
-	(*fun[i]) (arg, data[i]);
-    }
-    
-    xfree(fun);
-    xfree(data);
-}
-
-X_EXTERN void
-X_PFX (hook_free) (x_list *lst)
-{
-    x_list *node;
-
-    for (node = lst; node != NULL; node = node->next)
-    {
-	CELL_FREE (node->data);
-    }
-
-    X_PFX (list_free) (lst);
-}
+/* x-hook.c

+

+   Copyright (c) 2003 Apple Computer, Inc. All rights reserved.

+

+   Permission is hereby granted, free of charge, to any person

+   obtaining a copy of this software and associated documentation files

+   (the "Software"), to deal in the Software without restriction,

+   including without limitation the rights to use, copy, modify, merge,

+   publish, distribute, sublicense, and/or sell copies of the Software,

+   and to permit persons to whom the Software is furnished to do so,

+   subject to the following conditions:

+

+   The above copyright notice and this permission notice shall be

+   included in all copies or substantial portions of the Software.

+

+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

+   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

+   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT

+   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

+   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

+   DEALINGS IN THE SOFTWARE.

+

+   Except as contained in this notice, the name(s) of the above

+   copyright holders shall not be used in advertising or otherwise to

+   promote the sale, use or other dealings in this Software without

+   prior written authorization. */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "x-hook.h"

+#include <stdlib.h>

+#include <assert.h>

+#include "os.h"

+

+#define CELL_NEW(f,d) X_PFX (list_prepend) ((x_list *) (f), (d))

+#define CELL_FREE(c)  X_PFX (list_free_1) (c)

+#define CELL_FUN(c)   ((x_hook_function *) ((c)->next))

+#define CELL_DATA(c)  ((c)->data)

+

+X_EXTERN x_list *

+X_PFX (hook_add) (x_list *lst, x_hook_function *fun, void *data)

+{

+    return X_PFX (list_prepend) (lst, CELL_NEW (fun, data));

+}

+

+X_EXTERN x_list *

+X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data)

+{

+    x_list *node, *cell;

+    x_list *to_delete = NULL;

+

+    for (node = lst; node != NULL; node = node->next)

+    {

+	cell = node->data;

+	if (CELL_FUN (cell) == fun && CELL_DATA (cell) == data)

+	    to_delete = X_PFX (list_prepend) (to_delete, cell);

+    }

+

+    for (node = to_delete; node != NULL; node = node->next)

+    {

+	cell = node->data;

+	lst = X_PFX (list_remove) (lst, cell);

+	CELL_FREE (cell);

+    }

+

+    X_PFX (list_free) (to_delete);

+    return lst;

+}

+

+X_EXTERN void

+X_PFX (hook_run) (x_list *lst, void *arg)

+{

+    x_list *node, *cell;

+    x_hook_function **fun;

+    void **data;

+    int length, i;

+

+    if(!lst)

+        return;

+

+    length = X_PFX (list_length) (lst);

+    fun = malloc(sizeof (x_hook_function *) * length);

+    data = malloc(sizeof (void *) * length);

+

+    if(!fun || !data) {

+        FatalError("Failed to allocate memory in %s\n", __func__);

+    }

+    

+    for (i = 0, node = lst; node != NULL; node = node->next, i++)

+    {

+	cell = node->data;

+	fun[i] = CELL_FUN (cell);

+	data[i] = CELL_DATA (cell);

+    }

+

+    for (i = 0; i < length; i++)

+    {

+	(*fun[i]) (arg, data[i]);

+    }

+    

+    free(fun);

+    free(data);

+}

+

+X_EXTERN void

+X_PFX (hook_free) (x_list *lst)

+{

+    x_list *node;

+

+    for (node = lst; node != NULL; node = node->next)

+    {

+	CELL_FREE (node->data);

+    }

+

+    X_PFX (list_free) (lst);

+}