Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Only return values when there was no error.



details:   https://anonhg.NetBSD.org/src/rev/c88e666f9c95
branches:  trunk
changeset: 771711:c88e666f9c95
user:      mbalmer <mbalmer%NetBSD.org@localhost>
date:      Wed Nov 30 10:27:46 2011 +0000

description:
Only return values when there was no error.

diffstat:

 sys/kern/kern_ktrace.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 4ee775abe159 -r c88e666f9c95 sys/kern/kern_ktrace.c
--- a/sys/kern/kern_ktrace.c    Wed Nov 30 09:51:18 2011 +0000
+++ b/sys/kern/kern_ktrace.c    Wed Nov 30 10:27:46 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_ktrace.c,v 1.158 2011/09/01 18:24:19 matt Exp $   */
+/*     $NetBSD: kern_ktrace.c,v 1.159 2011/11/30 10:27:46 mbalmer Exp $        */
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.158 2011/09/01 18:24:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.159 2011/11/30 10:27:46 mbalmer Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -603,8 +603,8 @@
        ktp->ktr_code = code;
        ktp->ktr_eosys = 0;                     /* XXX unused */
        ktp->ktr_error = error;
-       ktp->ktr_retval = retval ? retval[0] : 0;
-       ktp->ktr_retval_1 = retval ? retval[1] : 0;
+       ktp->ktr_retval = retval && error == 0 ? retval[0] : 0;
+       ktp->ktr_retval_1 = retval && error == 0 ? retval[1] : 0;
 
        ktraddentry(l, kte, KTA_WAITOK);
 }



Home | Main Index | Thread Index | Old Index