X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/d7e50217d7adf6e52786a38bcaa4cd698cb9a79e..89b3af67bb32e691275bf6fa803d1834b2284115:/osfmk/ddb/db_variables.c

diff --git a/osfmk/ddb/db_variables.c b/osfmk/ddb/db_variables.c
index b30a42221..e1241672d 100644
--- a/osfmk/ddb/db_variables.c
+++ b/osfmk/ddb/db_variables.c
@@ -1,16 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
+ * 
+ * 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
@@ -20,7 +23,7 @@
  * 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@
@@ -162,7 +165,7 @@ db_cmp_variable_name(
 		  	      || (vp->high >= 0 && ap->suffix[0] > vp->high))))
 	    return(FALSE);
 	strcpy(ap->modif, (*np)? np+1: "");
-	ap->thr_act = (db_option(ap->modif, 't')?db_default_act: THR_ACT_NULL);
+	ap->thr_act = (db_option(ap->modif, 't')?db_default_act: THREAD_NULL);
 	ap->level = level;
 	ap->hidden_level = -1;
 	return(TRUE);
@@ -252,7 +255,7 @@ db_read_write_variable(
 	    ap = &aux_param;
 	    ap->modif = "";
 	    ap->level = 0;
-	    ap->thr_act = THR_ACT_NULL;
+	    ap->thr_act = THREAD_NULL;
 	}
 	if (rw_flag == DB_VAR_SET && vp->precious)
 		db_read_write_variable(vp, &old_value, DB_VAR_GET, ap);
@@ -265,7 +268,7 @@ db_read_write_variable(
 	    (*func)(vp, valuep, rw_flag, ap);
 	if (rw_flag == DB_VAR_SET && vp->precious)
 		db_printf("\t$%s:%s<%#x>\t%#8lln\t=\t%#8lln\n", vp->name,
-			  ap->modif, ap->thr_act, old_value, *valuep);
+			  ap->modif, ap->thr_act, (unsigned long long)old_value, (unsigned long long)*valuep);
 }
 
 void
@@ -434,7 +437,7 @@ db_show_one_variable(void)
 
 	    strcpy(aux_param.modif, *p ? p + 1 : "");
 	    aux_param.thr_act = (db_option(aux_param.modif, 't') ?
-			db_default_act : THR_ACT_NULL);
+			db_default_act : THREAD_NULL);
 	}
 
 	if (cur->hidden_level)
@@ -507,14 +510,14 @@ db_show_one_variable(void)
 		aux_param.suffix[0] = i;
 		(*cur->fcn)(cur, (db_expr_t *)0, DB_VAR_SHOW, &aux_param);
 	    } else {
-		db_printf("%#lln", *(cur->valuep + i));
+		db_printf("%#lln", (unsigned long long)*(cur->valuep + i));
 	        db_find_xtrn_task_sym_and_offset(*(cur->valuep + i), &name,
 						 &offset, TASK_NULL);
 		if (name != (char *)0 && offset <= db_maxoff &&
 		    offset != *(cur->valuep + i)) {
 		    db_printf("\t%s", name);
 		    if (offset != 0)
-			db_printf("+%#r", offset);
+			db_printf("+%#llr", (unsigned long long)offset);
 		}
 	    }
 	    db_putchar('\n');
@@ -597,7 +600,7 @@ db_show_variable(void)
 
 	aux_param.modif = "";
 	aux_param.level = 1;
-	aux_param.thr_act = THR_ACT_NULL;
+	aux_param.thr_act = THREAD_NULL;
 
 	for (cur = db_vars; cur < db_evars; cur++) {
 	    i = cur->low;
@@ -653,14 +656,14 @@ db_show_variable(void)
 		    aux_param.suffix[0] = i;
 		    (*cur->fcn)(cur, (db_expr_t *)0, DB_VAR_SHOW, &aux_param);
 		} else {
-		    db_printf("%#lln", *(cur->valuep + i));
+		    db_printf("%#lln", (unsigned long long)*(cur->valuep + i));
 		    db_find_xtrn_task_sym_and_offset(*(cur->valuep + i), &name,
 						     &offset, TASK_NULL);
 		    if (name != (char *)0 && offset <= db_maxoff &&
 			offset != *(cur->valuep + i)) {
 			db_printf("\t%s", name);
 			if (offset != 0)
-			    db_printf("+%#r", offset);
+			    db_printf("+%#llr", (unsigned long long)offset);
 		    }
 		}
 		db_putchar('\n');