From owner-p4-projects@FreeBSD.ORG  Sun Jul  1 10:50:43 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 69B1A16A474; Sun,  1 Jul 2007 10:50:43 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 47BA416A46F
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 10:50:43 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A2B613C487
	for <perforce@freebsd.org>; Sun,  1 Jul 2007 10:50:43 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l61AohWb001230
	for <perforce@freebsd.org>; Sun, 1 Jul 2007 10:50:43 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l61AoghD001227
	for perforce@freebsd.org; Sun, 1 Jul 2007 10:50:42 GMT
	(envelope-from peter@freebsd.org)
Date: Sun, 1 Jul 2007 10:50:42 GMT
Message-Id: <200707011050.l61AoghD001227@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122636 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jul 2007 10:50:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=122636

Change 122636 by peter@peter_melody on 2007/07/01 10:49:51

	Strip out most hackery.  Use the old lseek/mmap hooks for the freebsd6 stuff.

Affected files ...

.. //depot/projects/hammer/usr.bin/kdump/kdump.c#18 edit

Differences ...

==== //depot/projects/hammer/usr.bin/kdump/kdump.c#18 (text+ko) ====

@@ -308,14 +308,10 @@
 	int narg = ktr->ktr_narg;
 	register_t *ip;
 
-	if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0) {
+	if (ktr->ktr_code >= nsyscalls || ktr->ktr_code < 0)
 		(void)printf("[%d]", ktr->ktr_code);
-	} else {
-		if (strncmp(syscallnames[ktr->ktr_code], "_new_", 5) == 0)
-			(void)printf("%s", syscallnames[ktr->ktr_code] + 5);
-		else
-			(void)printf("%s", syscallnames[ktr->ktr_code]);
-	}
+	else
+		(void)printf("%s", syscallnames[ktr->ktr_code]);
 	ip = &ktr->ktr_args[0];
 	if (narg) {
 		char c = '(';
@@ -457,7 +453,7 @@
 				msyncflagsname((int)*ip);
 				ip++;
 				narg--;
-			} else if (ktr->ktr_code == SYS_mmap) {
+			} else if (ktr->ktr_code == SYS_freebsd6_mmap) {
 				print_number(ip,narg,c);
 				print_number(ip,narg,c);
 				(void)putchar(',');
@@ -468,7 +464,7 @@
 				mmapflagsname ((int)*ip);
 				ip++;
 				narg--;
-			} else if (ktr->ktr_code == SYS__new_mmap) {
+			} else if (ktr->ktr_code == SYS_mmap) {
 				print_number(ip,narg,c);
 				print_number(ip,narg,c);
 				(void)putchar(',');
@@ -540,7 +536,7 @@
 				sockoptname((int)*ip);
 				ip++;
 				narg--;
-			} else if (ktr->ktr_code == SYS_lseek) {
+			} else if (ktr->ktr_code == SYS_freebsd6_lseek) {
 				print_number(ip,narg,c);
 				/* Hidden 'pad' argument, not in lseek(2) */
 				print_number(ip,narg,c);
@@ -549,7 +545,7 @@
 				whencename ((int)*ip);
 				ip++;
 				narg--;
-			} else if (ktr->ktr_code == SYS__new_lseek) {
+			} else if (ktr->ktr_code == SYS_lseek) {
 				print_number(ip,narg,c);
 				/* Hidden 'pad' argument, not in lseek(2) */
 				print_number(ip,narg,c);
@@ -771,14 +767,10 @@
 	int error = ktr->ktr_error;
 	int code = ktr->ktr_code;
 
-	if (code >= nsyscalls || code < 0) {
+	if (code >= nsyscalls || code < 0)
 		(void)printf("[%d] ", code);
-	} else {
-		if (strncmp(syscallnames[code], "_new_", 5) == 0)
-			(void)printf("%s ", syscallnames[code] + 5);
-		else
-			(void)printf("%s ", syscallnames[code]);
-	}
+	else
+		(void)printf("%s ", syscallnames[code]);
 
 	if (error == 0) {
 		if (fancy) {