Module Name: src
Committed By: christos
Date: Thu Jan 5 21:32:37 UTC 2012
Modified Files:
src/distrib/utils/sysinst/arch/emips: md.c
src/distrib/utils/sysinst/arch/hp300: md.c
src/distrib/utils/sysinst/arch/hp700: md.c
src/distrib/utils/sysinst/arch/mipsco: md.c
src/distrib/utils/sysinst/arch/mvme68k: md.c
src/distrib/utils/sysinst/arch/pmax: md.c
src/distrib/utils/sysinst/arch/sgimips: md.c
src/distrib/utils/sysinst/arch/sparc: md.c
src/distrib/utils/sysinst/arch/sparc64: md.c
src/distrib/utils/sysinst/arch/vax: md.c
src/distrib/utils/sysinst/arch/x68k: md.c
Log Message:
eliminate logging variable from md code.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/utils/sysinst/arch/emips/md.c
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/arch/hp700/md.c
cvs rdiff -u -r1.19 -r1.20 src/distrib/utils/sysinst/arch/mipsco/md.c
cvs rdiff -u -r1.26 -r1.27 src/distrib/utils/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.66 -r1.67 src/distrib/utils/sysinst/arch/pmax/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/arch/sparc/md.c
cvs rdiff -u -r1.28 -r1.29 src/distrib/utils/sysinst/arch/sparc64/md.c
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/sysinst/arch/vax/md.c
cvs rdiff -u -r1.42 -r1.43 src/distrib/utils/sysinst/arch/x68k/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/arch/emips/md.c
diff -u src/distrib/utils/sysinst/arch/emips/md.c:1.4 src/distrib/utils/sysinst/arch/emips/md.c:1.5
--- src/distrib/utils/sysinst/arch/emips/md.c:1.4 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/emips/md.c Thu Jan 5 16:32:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.4 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.5 2012/01/05 21:32:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/hp300/md.c
diff -u src/distrib/utils/sysinst/arch/hp300/md.c:1.31 src/distrib/utils/sysinst/arch/hp300/md.c:1.32
--- src/distrib/utils/sysinst/arch/hp300/md.c:1.31 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/hp300/md.c Thu Jan 5 16:32:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.31 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.32 2012/01/05 21:32:35 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/hp700/md.c
diff -u src/distrib/utils/sysinst/arch/hp700/md.c:1.12 src/distrib/utils/sysinst/arch/hp700/md.c:1.13
--- src/distrib/utils/sysinst/arch/hp700/md.c:1.12 Fri Nov 4 07:27:02 2011
+++ src/distrib/utils/sysinst/arch/hp700/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.12 2011/11/04 11:27:02 martin Exp $ */
+/* $NetBSD: md.c,v 1.13 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,14 +72,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/mipsco/md.c
diff -u src/distrib/utils/sysinst/arch/mipsco/md.c:1.19 src/distrib/utils/sysinst/arch/mipsco/md.c:1.20
--- src/distrib/utils/sysinst/arch/mipsco/md.c:1.19 Fri Nov 4 07:27:03 2011
+++ src/distrib/utils/sysinst/arch/mipsco/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.19 2011/11/04 11:27:03 martin Exp $ */
+/* $NetBSD: md.c,v 1.20 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -71,14 +71,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/mvme68k/md.c
diff -u src/distrib/utils/sysinst/arch/mvme68k/md.c:1.26 src/distrib/utils/sysinst/arch/mvme68k/md.c:1.27
--- src/distrib/utils/sysinst/arch/mvme68k/md.c:1.26 Fri Nov 4 07:27:04 2011
+++ src/distrib/utils/sysinst/arch/mvme68k/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.26 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.27 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/pmax/md.c
diff -u src/distrib/utils/sysinst/arch/pmax/md.c:1.66 src/distrib/utils/sysinst/arch/pmax/md.c:1.67
--- src/distrib/utils/sysinst/arch/pmax/md.c:1.66 Fri Nov 4 07:27:04 2011
+++ src/distrib/utils/sysinst/arch/pmax/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.66 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.67 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -70,14 +70,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/sgimips/md.c
diff -u src/distrib/utils/sysinst/arch/sgimips/md.c:1.28 src/distrib/utils/sysinst/arch/sgimips/md.c:1.29
--- src/distrib/utils/sysinst/arch/sgimips/md.c:1.28 Fri Nov 4 07:27:04 2011
+++ src/distrib/utils/sysinst/arch/sgimips/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.28 2011/11/04 11:27:04 martin Exp $ */
+/* $NetBSD: md.c,v 1.29 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -87,14 +87,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/sparc/md.c
diff -u src/distrib/utils/sysinst/arch/sparc/md.c:1.51 src/distrib/utils/sysinst/arch/sparc/md.c:1.52
--- src/distrib/utils/sysinst/arch/sparc/md.c:1.51 Fri Nov 4 07:27:05 2011
+++ src/distrib/utils/sysinst/arch/sparc/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.51 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.52 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -76,14 +76,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/sparc64/md.c
diff -u src/distrib/utils/sysinst/arch/sparc64/md.c:1.28 src/distrib/utils/sysinst/arch/sparc64/md.c:1.29
--- src/distrib/utils/sysinst/arch/sparc64/md.c:1.28 Fri Nov 4 07:27:05 2011
+++ src/distrib/utils/sysinst/arch/sparc64/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.28 2011/11/04 11:27:05 martin Exp $ */
+/* $NetBSD: md.c,v 1.29 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -77,14 +77,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/vax/md.c
diff -u src/distrib/utils/sysinst/arch/vax/md.c:1.38 src/distrib/utils/sysinst/arch/vax/md.c:1.39
--- src/distrib/utils/sysinst/arch/vax/md.c:1.38 Mon Nov 7 07:40:26 2011
+++ src/distrib/utils/sysinst/arch/vax/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.38 2011/11/07 12:40:26 he Exp $ */
+/* $NetBSD: md.c,v 1.39 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -74,14 +74,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
Index: src/distrib/utils/sysinst/arch/x68k/md.c
diff -u src/distrib/utils/sysinst/arch/x68k/md.c:1.42 src/distrib/utils/sysinst/arch/x68k/md.c:1.43
--- src/distrib/utils/sysinst/arch/x68k/md.c:1.42 Mon Nov 7 09:18:51 2011
+++ src/distrib/utils/sysinst/arch/x68k/md.c Thu Jan 5 16:32:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.42 2011/11/07 14:18:51 he Exp $ */
+/* $NetBSD: md.c,v 1.43 2012/01/05 21:32:36 christos Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -87,14 +87,14 @@ md_get_info(void)
fd = open(dev_name, O_RDONLY, 0);
if (fd < 0) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't open %s\n", dev_name);
endwin();
fprintf(stderr, "Can't open %s\n", dev_name);
exit(1);
}
if (ioctl(fd, DIOCGDINFO, &disklabel) == -1) {
- if (logging)
+ if (logfp)
(void)fprintf(logfp, "Can't read disklabel on %s.\n",
dev_name);
endwin();
