Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get hard-coded messages out of the source, into the message file. (Gee, 

you'd think that this wouldn't have been a problem to begin with...)
This commit is contained in:
cgd 1999-07-04 22:52:22 +00:00
parent 1a53711865
commit b62c0ee8ad
3 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
distrib/utils/sysinst/arch/mac68k/md.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: md.c,v 1.10 1999/07/04 10:45:37 cgd Exp $ */
/* $NetBSD: md.c,v 1.11 1999/07/04 22:52:22 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -449,38 +449,38 @@ report_errors()
EBZB *bzb;
if (!map.root_cnt) {
msg_printf_add (" No Disk Partition defined for Root!\n");
msg_display_add(MSG_disksetup_no_root);
errs++;
}
if (map.root_cnt > 1) {
msg_printf_add (" Multiple Disk Partitions defined for Root\n");
msg_display_add(MSG_disksetup_multiple_roots);
errs++;
}
if (!map.swap_cnt) {
msg_printf_add (" No Disk Partition defined for SWAP!\n");
msg_display_add(MSG_disksetup_no_swap);
errs++;
}
if (map.swap_cnt > 1) {
msg_printf_add (" Multiple Disk Partitions defined for SWAP\n");
msg_display_add(MSG_disksetup_multiple_swaps);
errs++;
}
for (i=0;i<map.usable_cnt;i++) {
j = map.mblk[i];
if (map.blk[j].pmPyPartStart > dlsize) {
bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
msg_printf_add (" Partition %s%c begins beyond end of disk\n",
msg_display_add(MSG_disksetup_part_beginning,
diskdev, bzb->flags.part);
errs++;
}
if ((map.blk[j].pmPyPartStart + map.blk[j].pmPartBlkCnt) > dlsize) {
bzb = (EBZB *)&map.blk[j].pmBootArgs[0];
msg_printf_add (" Partition %s%c extends beyond end of disk\n",
msg_display_add(MSG_disksetup_part_size,
diskdev, bzb->flags.part);
errs++;
}
}
if (!errs)
msg_printf_add ("** No errors or anomalies found in disk setup.\n");
msg_display_add(MSG_disksetup_noerrors);
return;
}

6
distrib/utils/sysinst/arch/mac68k/menus.md.en
View File

@ -1,4 +1,4 @@
/* $NetBSD: menus.md.en,v 1.6 1999/07/04 22:31:39 cgd Exp $ */
/* $NetBSD: menus.md.en,v 1.7 1999/07/04 22:52:22 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -129,14 +129,14 @@ menu editparttable, title "Choose your partition", exit, y=15;
map.blk[i].pmPartBlkCnt);
if ((map.blk[i].pmPyPartStart +
map.blk[i].pmPartBlkCnt) > dlsize) {
msg_printf_add("Fixing partition %s%c\n",
msg_display_add(MSG_parttable_fix_fixing,
diskdev, bzb->flags.part);
map.blk[i].pmPartBlkCnt =
dlsize - map.blk[i].pmPyPartStart;
map.blk[i].pmDataCnt =
map.blk[i].pmPartBlkCnt;
} else {
msg_printf_add("Partition %s%c is just fine!\n",
msg_display_add(MSG_parttable_fix_fine,
diskdev, bzb->flags.part);
}
process_menu(MENU_ok);

29
distrib/utils/sysinst/arch/mac68k/msg.md.en
View File

@ -1,4 +1,4 @@
/* $NetBSD: msg.md.en,v 1.6 1999/07/04 09:41:04 cgd Exp $ */
/* $NetBSD: msg.md.en,v 1.7 1999/07/04 22:52:22 cgd Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -188,3 +188,30 @@ message geomdebug
message geomdebug2
{Calling: %s %d\n"
}
message disksetup_no_root
{* No Disk Partition defined for Root!\n}
message disksetup_multiple_roots
{* Multiple Disk Partitions defined for Root\n}
message disksetup_no_swap
{* No Disk Partition defined for SWAP!\n}
message disksetup_multiple_swaps
{* Multiple Disk Partitions defined for SWAP\n}
message disksetup_part_beginning
{* Partition %s%c begins beyond end of disk\n}
message disksetup_part_size
{* Partition %s%c extends beyond end of disk\n}
message disksetup_noerrors
{** No errors or anomalies found in disk setup.\n}
message parttable_fix_fixing
{Fixing partition %s%c\n}
message parttable_fix_fine
{Partition %s%c is just fine!\n}