X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/378393581903b274cb7a4d18e0d978071a6b592d..13f56ec4e58bf8687e2a68032c093c0213dd519b:/osfmk/ddb/db_expr.c

diff --git a/osfmk/ddb/db_expr.c b/osfmk/ddb/db_expr.c
index 46bf7fc09..9c3962bc7 100644
--- a/osfmk/ddb/db_expr.c
+++ b/osfmk/ddb/db_expr.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,
- * 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@
@@ -95,7 +101,7 @@ db_term(db_expr_t *valuep)
 		valid_symbol = TRUE;
 	    }
 	    if (db_allow_unprefixed_hexa && db_radix == 16 &&
-		db_tok_string) {
+		db_tok_string[0]) {
 		char *cp;
 		db_expr_t value;
 		    
@@ -161,7 +167,7 @@ db_term(db_expr_t *valuep)
 	    return (TRUE);
 	case tSTRING:
 	    {
-		    static db_tok_offset = 0;
+		    static int db_tok_offset = 0;
 		    char *sp, *cp;
 
 		    sp = (char *)db_tok_string + db_tok_offset;
@@ -223,7 +229,6 @@ db_unary(db_expr_t *valuep)
 	int	  size;
 	boolean_t u_opt, t_opt;
 	task_t	  task;
-	extern	  task_t db_default_task;
 
 	t = db_read_token();
 	if (t == tMINUS) {
@@ -358,7 +363,7 @@ db_shift_expr(db_expr_t *valuep)
 		db_error(0);
 		/*NOTREACHED*/
 	    }
-	    if (rhs < 0) {
+	    if ((int64_t)rhs < 0) {
 		db_error("Negative shift amount\n");
 		/*NOTREACHED*/
 	    }