Module Name: src
Committed By: tls
Date: Sun Aug 10 06:58:18 UTC 2014
Modified Files:
src/usr.bin/kdump [tls-earlyentropy]: kdump.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.117.2.1 src/usr.bin/kdump/kdump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.117 src/usr.bin/kdump/kdump.c:1.117.2.1
--- src/usr.bin/kdump/kdump.c:1.117 Wed Nov 27 20:27:58 2013
+++ src/usr.bin/kdump/kdump.c Sun Aug 10 06:58:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.117 2013/11/27 20:27:58 christos Exp $ */
+/* $NetBSD: kdump.c,v 1.117.2.1 2014/08/10 06:58:18 tls Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.117 2013/11/27 20:27:58 christos Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.117.2.1 2014/08/10 06:58:18 tls Exp $");
#endif
#endif /* not lint */
@@ -652,14 +652,13 @@ rprint(register_t ret)
{
if (!plain) {
- (void)printf("%ld", (long)ret);
- if (!small(ret))
- (void)printf("/%#lx", (long)ret);
+ output_long(ret, 0);
+ if (!small(ret)) {
+ putchar('/');
+ output_long(ret, 1);
+ }
} else {
- if (decimal || small(ret))
- (void)printf("%ld", (long)ret);
- else
- (void)printf("%#lx", (long)ret);
+ output_long(ret, !(decimal || small(ret)));
}
}
