From f578e43dec8c813349936f6305d13f57982500f3 Mon Sep 17 00:00:00 2001 From: uwe Date: Thu, 18 Dec 2003 12:15:40 +0000 Subject: [PATCH] Capitalize error messages. Consistently use "can't". Minor tweaks. --- sys/arch/hpc/stand/hpcboot/hpcboot.cpp | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/arch/hpc/stand/hpcboot/hpcboot.cpp b/sys/arch/hpc/stand/hpcboot/hpcboot.cpp index 71537b8e26e2..05d2e12a9222 100644 --- a/sys/arch/hpc/stand/hpcboot/hpcboot.cpp +++ b/sys/arch/hpc/stand/hpcboot/hpcboot.cpp @@ -1,4 +1,4 @@ -/* $NetBSD: hpcboot.cpp,v 1.8 2003/12/18 00:00:19 uwe Exp $ */ +/* $NetBSD: hpcboot.cpp,v 1.9 2003/12/18 12:15:40 uwe Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -107,19 +107,19 @@ hpcboot(void *arg) menu.progress(); if (!f.setup()) { - error_message = TEXT("architecture not supported.\n"); + error_message = TEXT("Architecture not supported.\n"); goto failed_exit; } menu.progress(); if (!f.create()) { - error_message = TEXT("architexture ops. not found.\n"); + error_message = TEXT("Architecture ops. not found.\n"); goto failed_exit; } menu.progress(); if (!f._arch->init()) { - error_message = TEXT("architecture initialize failed.\n"); + error_message = TEXT("Architecture initialize failed.\n"); goto failed_exit; } @@ -128,7 +128,7 @@ hpcboot(void *arg) menu.progress(); // kernel / file system image directory. if (!f._file->setRoot(f.args.fileRoot)) { - error_message = TEXT("couldn't set root directory.\n"); + error_message = TEXT("Can't set root directory.\n"); goto failed_exit; } @@ -137,7 +137,7 @@ hpcboot(void *arg) { if (!f._file->open(f.args.mfsName)) { error_message = - TEXT("couldn't open file system image.\n"); + TEXT("Can't open file system image.\n"); goto failed_exit; } sz = f._file->size(); @@ -147,7 +147,7 @@ hpcboot(void *arg) menu.progress(); if (!f._file->open(f.args.fileName)) { - error_message = TEXT("couldn't open kernel image.\n"); + error_message = TEXT("Can't open kernel image.\n"); goto failed_exit; } @@ -157,7 +157,7 @@ hpcboot(void *arg) goto file_close_exit; if (!f._loader->setFile(f._file)) { - error_message = TEXT("couldn't initialize loader.\n"); + error_message = TEXT("Can't initialize loader.\n"); goto file_close_exit; } @@ -166,20 +166,20 @@ hpcboot(void *arg) // allocate required memory. if (!f._arch->allocateMemory(sz)) { - error_message = TEXT("couldn't allocate memory.\n"); + error_message = TEXT("Can't allocate memory.\n"); goto file_close_exit; } menu.progress(); // load kernel to memory. if (!f._arch->setupLoader()) { - error_message = TEXT("couldn't set up loader.\n"); + error_message = TEXT("Can't set up loader.\n"); goto file_close_exit; } menu.progress(); if (!f._loader->load()) { - error_message = TEXT("couldn't load kernel image to memory.\n"); + error_message = TEXT("Can't load kernel image to memory.\n"); goto file_close_exit; } menu.progress(); @@ -189,12 +189,12 @@ hpcboot(void *arg) if (f.args.loadmfs) { if (!f._file->open(f.args.mfsName)) { error_message = - TEXT("couldn't open file system image.\n"); + TEXT("Can't open file system image.\n"); goto failed_exit; } if (!f._loader->loadExtData()) { error_message = - TEXT("couldn't load filesystem image to memory.\n"); + TEXT("Can't load file system image to memory.\n"); goto file_close_exit; } f._file->close(); @@ -212,8 +212,8 @@ hpcboot(void *arg) if (HPC_PREFERENCE.pause_before_boot) { if (MessageBox(menu._root->_window, TEXT("Push YES to boot."), TEXT("Last chance..."), - MB_ICONEXCLAMATION | MB_YESNO) != IDYES) - error_message = TEXT("Cancelled by user.\n"); + MB_ICONWARNING | MB_YESNO) != IDYES) + error_message = TEXT("Canceled by user.\n"); goto failed_exit; } @@ -222,7 +222,7 @@ hpcboot(void *arg) file_close_exit: if (error_message == 0) - error_message = TEXT("can't jump to kernel.\n"); + error_message = TEXT("Can't jump to the kernel.\n"); f._file->close(); failed_exit: MessageBox(menu._root->_window, error_message,