xnu-1456.1.26.tar.gz

[apple/xnu.git] / osfmk / ddb / db_watch.c

diff --git a/osfmk/ddb/db_watch.c b/osfmk/ddb/db_watch.c
index 3a99ac5ab4b8426282c6f36d381caee987f41060..f4a7400288313ee1e695ef6bfd5cff1b9c247c5e 100644 (file)
--- a/osfmk/ddb/db_watch.c
+++ b/osfmk/ddb/db_watch.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -237,7 +243,7 @@ db_get_task(
        user_space = db_option(modif, 'T');
        if (user_space) {
            if (db_expression(&value)) {
        user_space = db_option(modif, 'T');
        if (user_space) {
            if (db_expression(&value)) {

-               task = (task_t)value;
+               task = (task_t)(unsigned long)value;

                if (db_lookup_task(task) < 0) {
                    db_printf("bad task address %X\n", task);
                    return(-1);
                if (db_lookup_task(task) < 0) {
                    db_printf("bad task address %X\n", task);
                    return(-1);


@@ -263,11 +269,8 @@ db_get_task(
 
 /* Delete watchpoint */
 void
 
 /* Delete watchpoint */
 void

-db_deletewatch_cmd(
-       db_expr_t       addr,
-       int             have_addr,
-       db_expr_t       count,
-       char *          modif)
+db_deletewatch_cmd(db_expr_t addr, __unused boolean_t have_addr,
+                  __unused db_expr_t count, char *modif)

 {
        task_t          task;
 
 {
        task_t          task;
 


@@ -278,11 +281,8 @@ db_deletewatch_cmd(
 
 /* Set watchpoint */
 void
 
 /* Set watchpoint */
 void

-db_watchpoint_cmd(
-       db_expr_t       addr,
-       int             have_addr,
-       db_expr_t       count,
-       char *          modif)
+db_watchpoint_cmd(db_expr_t addr, __unused boolean_t have_addr,
+                 __unused db_expr_t count, char *modif)

 {
        vm_size_t       size;
        db_expr_t       value;
 {
        vm_size_t       size;
        db_expr_t       value;


@@ -299,7 +299,8 @@ db_watchpoint_cmd(
 
 /* list watchpoints */
 void
 
 /* list watchpoints */
 void

-db_listwatch_cmd(void)
+db_listwatch_cmd(__unused db_expr_t addr, __unused boolean_t have_addr,
+                __unused db_expr_t count, __unused char *modif)

 {
        db_list_watchpoints();
 }
 {
        db_list_watchpoints();
 }