From 18961ad2c52f9d85e1f18c75f82d40639f483e1a Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 27 Jul 2015 14:43:57 +0300 Subject: [PATCH] 6087 bootadm message.h is hiding errors from lint Reviewed by: Josef Sipek Reviewed by: Marcel Telka Reviewed by: Andrew Stormont Approved by: Richard Lowe --- usr/src/cmd/boot/bootadm/bootadm.c | 4 +- usr/src/cmd/boot/bootadm/bootadm_upgrade.c | 4 +- usr/src/cmd/boot/bootadm/message.h | 548 +++++++++++++++-------------- 3 files changed, 281 insertions(+), 275 deletions(-) diff --git a/usr/src/cmd/boot/bootadm/bootadm.c b/usr/src/cmd/boot/bootadm/bootadm.c index e948e7c34c..dfafc5f87f 100644 --- a/usr/src/cmd/boot/bootadm/bootadm.c +++ b/usr/src/cmd/boot/bootadm/bootadm.c @@ -2269,7 +2269,7 @@ is_valid_archive(char *root, int what) if (stat(timestamp_path, ×tamp) != 0 || sb.st_mtime > timestamp.st_mtime) { if (bam_verbose && !bam_check) - bam_print(UPDATE_CACHE_OLD, timestamp); + bam_print(UPDATE_CACHE_OLD); /* * Don't generate a false positive for the boot-archive service * but trigger an update of the archive cache in @@ -2688,7 +2688,7 @@ update_timestamp(char *root) */ if (creat(timestamp_path, FILE_STAT_MODE) < 0) { bam_error(OPEN_FAIL, timestamp_path, strerror(errno)); - bam_error(TIMESTAMP_FAIL, rootbuf); + bam_error(TIMESTAMP_FAIL); } } diff --git a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c index bb04f64749..82ff62a05f 100644 --- a/usr/src/cmd/boot/bootadm/bootadm_upgrade.c +++ b/usr/src/cmd/boot/bootadm/bootadm_upgrade.c @@ -21,7 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2014 Toomas Soome + * Copyright 2015 Toomas Soome */ #include @@ -887,7 +887,7 @@ upgrade_menu(menu_t *mp, char *osroot, char *menu_root) */ if (bam_is_findroot != BAM_FINDROOT_PRESENT || bam_direct != BAM_DIRECT_DBOOT) { - bam_error(DOWNGRADE_NOTSUP, osroot); + bam_error(DOWNGRADE_NOTSUP); return (BAM_ERROR); } diff --git a/usr/src/cmd/boot/bootadm/message.h b/usr/src/cmd/boot/bootadm/message.h index d2141441e6..4e43b5c3da 100644 --- a/usr/src/cmd/boot/bootadm/message.h +++ b/usr/src/cmd/boot/bootadm/message.h @@ -21,7 +21,7 @@ /* * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. - * Copyright 2014 Toomas Soome + * Copyright 2015 Toomas Soome */ #ifndef _MESSAGE_H @@ -33,672 +33,678 @@ extern "C" { #include -#define FILE_MISS gettext("file not found: %s\n") +#ifndef lint +#define _(x) gettext(x) +#else +#define _(x) (x) +#endif + +#define FILE_MISS _("file not found: %s\n") -#define ARCH_EXEC_MISS gettext("archive creation file not found: %s: %s\n") +#define ARCH_EXEC_MISS _("archive creation file not found: %s: %s\n") -#define PATH_EXEC_OWNER gettext("%s is not owned by %d, skipping\n") +#define PATH_EXEC_OWNER _("%s is not owned by %d, skipping\n") -#define PATH_EXEC_LINK gettext("%s is not a regular file, skipping\n") +#define PATH_EXEC_LINK _("%s is not a regular file, skipping\n") -#define PATH_EXEC_PERMS gettext("%s is others or group writable, skipping\n") +#define PATH_EXEC_PERMS _("%s is others or group writable, skipping\n") -#define UPDATE_CACHE_OLD gettext("archive cache is out of sync. Rebuilding.\n") +#define UPDATE_CACHE_OLD _("archive cache is out of sync. Rebuilding.\n") -#define MUST_BE_ROOT gettext("you must be root to run this command\n") +#define MUST_BE_ROOT _("you must be root to run this command\n") #define NOT_ARCHIVE_BOOT \ - gettext("%s: not a boot archive based Solaris instance\n") + _("%s: not a boot archive based Solaris instance\n") -#define MULT_CMDS gettext("multiple commands specified: -%c\n") +#define MULT_CMDS _("multiple commands specified: -%c\n") -#define INVALID_SUBCMD gettext("invalid sub-command specified: %s\n") +#define INVALID_SUBCMD _("invalid sub-command specified: %s\n") -#define NEED_SUBCMD gettext("this command requires a sub-command\n") +#define NEED_SUBCMD _("this command requires a sub-command\n") -#define NEED_CMD gettext("a command option must be specified\n") +#define NEED_CMD _("a command option must be specified\n") -#define DUP_OPT gettext("duplicate options specified: -%c\n") +#define DUP_OPT _("duplicate options specified: -%c\n") -#define BAD_OPT gettext("invalid option or missing option argument: -%c\n") +#define BAD_OPT _("invalid option or missing option argument: -%c\n") -#define NO_OPT_REQ gettext("this sub-command (%s) does not take options\n") +#define NO_OPT_REQ _("this sub-command (%s) does not take options\n") -#define MISS_OPT gettext("an option is required for this sub-command: %s\n") +#define MISS_OPT _("an option is required for this sub-command: %s\n") -#define ABS_PATH_REQ gettext("path is not absolute: %s\n") +#define ABS_PATH_REQ _("path is not absolute: %s\n") #define PATH_TOO_LONG \ - gettext("unable to create path on mountpoint %s, path too long\n") + _("unable to create path on mountpoint %s, path too long\n") -#define TOO_LONG gettext("the following line is too long (> %d chars)\n\t%s\n") +#define TOO_LONG _("the following line is too long (> %d chars)\n\t%s\n") #define NOT_GRUB_BOOT \ - gettext("not a GRUB 0.97 based Illumos instance. Operation not supported\n") + _("not a GRUB 0.97 based Illumos instance. Operation not supported\n") -#define NOT_GRUB_ROOT gettext("missing /boot/grub on root: %s\n") +#define NOT_GRUB_ROOT _("missing /boot/grub on root: %s\n") #define ALT_ROOT_INVALID \ - gettext("an alternate root (%s) cannot be used with this sub-command\n") + _("an alternate root (%s) cannot be used with this sub-command\n") -#define NO_ENTRY gettext("no %s entry found\n") +#define NO_ENTRY _("no %s entry found\n") -#define NO_MATCH_ENTRY gettext("no matching entry found\n") +#define NO_MATCH_ENTRY _("no matching entry found\n") -#define NO_BOOTADM_MATCH gettext("no matching bootadm entry found\n") +#define NO_BOOTADM_MATCH _("no matching bootadm entry found\n") -#define NO_MEM gettext("could not allocate memory: size = %u\n") +#define NO_MEM _("could not allocate memory: size = %u\n") -#define NO_SPARC gettext("%s operation unsupported on SPARC machines\n") +#define NO_SPARC _("%s operation unsupported on SPARC machines\n") -#define CANNOT_LOCATE_GRUB_MENU gettext("cannot find GRUB menu\n") +#define CANNOT_LOCATE_GRUB_MENU _("cannot find GRUB menu\n") -#define CANNOT_LOCATE_GRUB_MENU_FILE gettext("cannot find GRUB menu file: %s\n") +#define CANNOT_LOCATE_GRUB_MENU_FILE _("cannot find GRUB menu file: %s\n") -#define GRUB_MENU_PATH gettext("the location for the active GRUB menu is: %s\n") +#define GRUB_MENU_PATH _("the location for the active GRUB menu is: %s\n") -#define STUBBOOT_DIR_NOT_FOUND gettext("cannot find stubboot directory\n") +#define STUBBOOT_DIR_NOT_FOUND _("cannot find stubboot directory\n") -#define NO_CMD gettext("no command at line %d\n") +#define NO_CMD _("no command at line %d\n") #define DUP_CMD \ - gettext("duplicate command %s at line %d of %sboot/grub/menu.lst\n") + _("duplicate command %s at line %d of %sboot/grub/menu.lst\n") -#define NO_MENU gettext("menu file not found: %s\n") +#define NO_MENU _("menu file not found: %s\n") -#define GLOBAL_CMD gettext("%s %s\n") +#define GLOBAL_CMD _("%s %s\n") -#define INVALID_ENTRY gettext("invalid boot entry number: %s\n") +#define INVALID_ENTRY _("invalid boot entry number: %s\n") -#define INVALID_OPTION gettext("invalid option: %s\n") +#define INVALID_OPTION _("invalid option: %s\n") -#define SUBOPT_MISS gettext("missing suboption: %s\n") +#define SUBOPT_MISS _("missing suboption: %s\n") -#define NO_KERNEL gettext("no kernel line found in entry %d\n") +#define NO_KERNEL _("no kernel line found in entry %d\n") -#define EMPTY_MENU gettext("the GRUB menu is empty\n") +#define EMPTY_MENU _("the GRUB menu is empty\n") -#define UNLINK_EMPTY gettext("file is empty, deleting file: %s\n") +#define UNLINK_EMPTY _("file is empty, deleting file: %s\n") -#define UNLINK_FAIL gettext("failed to unlink file: %s: %s\n") +#define UNLINK_FAIL _("failed to unlink file: %s: %s\n") -#define NO_MATCH gettext("no matching entry found: %s\n") +#define NO_MATCH _("no matching entry found: %s\n") -#define INVALID_OPT gettext("invalid option: %s\n") +#define INVALID_OPT _("invalid option: %s\n") -#define FAILED_SIG gettext("cannot set SIGCHLD disposition: %s\n") +#define FAILED_SIG _("cannot set SIGCHLD disposition: %s\n") -#define CANT_UNBLOCK_SIGCHLD gettext("cannot unblock SIGCHLD: %s\n") +#define CANT_UNBLOCK_SIGCHLD _("cannot unblock SIGCHLD: %s\n") #define NO3264ELF \ - gettext("WARNING: file %s is neither a 32-bit nor a 64-bit ELF\n") + _("WARNING: file %s is neither a 32-bit nor a 64-bit ELF\n") -#define BLOCKED_SIG gettext("SIGCHLD signal blocked. Cannot exec: %s\n") +#define BLOCKED_SIG _("SIGCHLD signal blocked. Cannot exec: %s\n") -#define POPEN_FAIL gettext("popen failed: %s\n") +#define POPEN_FAIL _("popen failed: %s: %s\n") -#define PCLOSE_FAIL gettext("pclose failed: %s\n") +#define PCLOSE_FAIL _("pclose failed: %s: %s\n") -#define EXEC_FAIL gettext("command terminated abnormally: %s: %d\n") +#define EXEC_FAIL _("command terminated abnormally: %s: %d\n") -#define OPEN_FAIL gettext("failed to open file: %s: %s\n") +#define OPEN_FAIL _("failed to open file: %s: %s\n") -#define LOCK_FAIL gettext("failed to lock file: %s: %s\n") +#define LOCK_FAIL _("failed to lock file: %s: %s\n") -#define UNLOCK_FAIL gettext("failed to unlock file: %s: %s\n") +#define UNLOCK_FAIL _("failed to unlock file: %s: %s\n") -#define TIMESTAMP_FAIL gettext("failed to update the timestamp file, next\ +#define TIMESTAMP_FAIL _("failed to update the timestamp file, next\ archive update may experience reduced performance\n") -#define MMAP_FAIL gettext("failed to mmap file: %s: %s\n") +#define MMAP_FAIL _("failed to mmap file: %s: %s\n") -#define FILE_LOCKED gettext("another instance of bootadm (pid %u) is running\n") +#define FILE_LOCKED _("another instance of bootadm (pid %lu) is running\n") -#define NO_FLIST gettext("archive filelist is empty\n") +#define NO_FLIST _("archive filelist is empty\n") -#define CLOSE_FAIL gettext("failed to close file: %s: %s\n") +#define CLOSE_FAIL _("failed to close file: %s: %s\n") -#define RENAME_FAIL gettext("rename to file failed: %s: %s\n") +#define RENAME_FAIL _("rename to file failed: %s: %s\n") -#define NOT_IN_MNTTAB gettext("alternate root %s not in mnttab\n") +#define NOT_IN_MNTTAB _("alternate root %s not in mnttab\n") -#define CANT_RESOLVE gettext("cannot resolve path %s: %s\n") +#define CANT_RESOLVE _("cannot resolve path %s: %s\n") -#define ROOT_ABS gettext("this sub-command doesn't take root arguments: %s\n") +#define ROOT_ABS _("this sub-command doesn't take root arguments: %s\n") -#define ARCHIVE_FAIL gettext("boot-archive creation FAILED, command: '%s'\n") +#define ARCHIVE_FAIL _("boot-archive creation FAILED, command: '%s'\n") #define MULTI_FAIL \ - gettext("Command '%s' failed while generating multisession archive\n") + _("Command '%s' failed while generating multisession archive\n") -#define INFILE_FAIL gettext("unable to read from %s: %s\n") +#define INFILE_FAIL _("unable to read from %s: %s\n") -#define ARCHIVE_BAD gettext("archive file %s not generated correctly\n") +#define ARCHIVE_BAD _("archive file %s not generated correctly\n") #define CACHE_FAIL \ - gettext("Failed to gather cache files, archives generation aborted\n") + _("Failed to gather cache files, archives generation aborted\n") -#define BOOTBLK_FAIL gettext("unable to access bootblk file : %s\n") +#define BOOTBLK_FAIL _("unable to access bootblk file : %s\n") -#define WRITE_FAIL gettext("write to file failed: %s: %s\n") +#define WRITE_FAIL _("write to file failed: %s: %s\n") -#define GZ_WRITE_FAIL gettext("failed to write to %s\n") +#define GZ_WRITE_FAIL _("failed to write to %s\n") -#define STAT_FAIL gettext("stat of file failed: %s: %s\n") +#define STAT_FAIL _("stat of file failed: %s: %s\n") -#define PACK_FAIL gettext("failed to pack stat data: %s\n") +#define PACK_FAIL _("failed to pack stat data: %s\n") -#define NVALLOC_FAIL gettext("failed to create stat data: %s\n") +#define NVALLOC_FAIL _("failed to create stat data: %s\n") -#define NVADD_FAIL gettext("failed to update stat data for: %s: %s\n") +#define NVADD_FAIL _("failed to update stat data for: %s: %s\n") #define DISKMAP_FAIL \ - gettext("create_diskmap command failed for OS root: %s.\n") + _("create_diskmap command failed for OS root: %s.\n") #define BIOSDEV_SKIP \ - gettext("not using biosdev command for disk: %s.\n") + _("not using biosdev command for disk: %s.\n") #define CHECK_NOT_SUPPORTED \ - gettext("the check option is not supported with subcmd: %s\n") + _("the check option is not supported with subcmd: %s\n") -#define PARSEABLE_NEW_FILE gettext(" new %s\n") +#define PARSEABLE_NEW_FILE _(" new %s\n") -#define PARSEABLE_OUT_DATE gettext(" changed %s\n") +#define PARSEABLE_OUT_DATE _(" changed %s\n") -#define PARSEABLE_STALE_FILE gettext(" stale %s\n") +#define PARSEABLE_STALE_FILE _(" stale %s\n") -#define UPDATE_FORCE gettext("forced update of archive requested\n") +#define UPDATE_FORCE _("forced update of archive requested\n") -#define NO_NEW_STAT gettext("cannot create new stat data\n") +#define NO_NEW_STAT _("cannot create new stat data\n") -#define UPDATE_ARCH_MISS gettext("archive not found: %s\n") +#define UPDATE_ARCH_MISS _("archive not found: %s\n") -#define UPDATE_CDIR_MISS gettext("archive cache directory not found: %s\n") +#define UPDATE_CDIR_MISS _("archive cache directory not found: %s\n") #define MULTI_SIZE \ - gettext("archive %s is bigger than %d bytes and will be rebuilt\n") + _("archive %s is bigger than %d bytes and will be rebuilt\n") -#define READ_FAIL gettext("read failed for file: %s: %s\n") +#define READ_FAIL _("read failed for file: %s: %s\n") -#define UNPACK_FAIL gettext("failed to unpack stat data: %s: %s\n") +#define UNPACK_FAIL _("failed to unpack stat data: %s: %s\n") -#define NFTW_FAIL gettext("cannot find: %s: %s\n") +#define NFTW_FAIL _("cannot find: %s: %s\n") -#define SIGN_FAIL gettext("iso descriptor signature for %s is invalid\n") +#define SIGN_FAIL _("iso descriptor signature for %s is invalid\n") -#define STATVFS_FAIL gettext("statvfs failed for %s: %s\n") +#define STATVFS_FAIL _("statvfs failed for %s: %s\n") -#define IS_RAMDISK gettext("%s is on a ramdisk device\n") +#define IS_RAMDISK _("%s is on a ramdisk device\n") -#define PRINT gettext("%s\n") +#define PRINT _("%s\n") -#define PRINT_TITLE gettext("%d %s\n") +#define PRINT_TITLE _("%d %s\n") -#define INT_ERROR gettext("Internal error: %s\n") +#define INT_ERROR _("Internal error: %s\n") #define CANT_FIND_USER \ - gettext("getpwnam: uid for %s failed, defaulting to %d\n") + _("getpwnam: uid for %s failed, defaulting to %d\n") #define CANT_FIND_GROUP \ - gettext("getgrnam: gid for %s failed, defaulting to %d\n") + _("getgrnam: gid for %s failed, defaulting to %d\n") -#define CHMOD_FAIL gettext("chmod operation on %s failed - %s\n") +#define CHMOD_FAIL _("chmod operation on %s failed - %s\n") -#define CHOWN_FAIL gettext("chgrp operation on %s failed - %s\n") +#define CHOWN_FAIL _("chgrp operation on %s failed - %s\n") -#define MISSING_SLICE_FILE gettext("GRUB slice file %s missing: %s\n") +#define MISSING_SLICE_FILE _("GRUB slice file %s missing: %s\n") -#define MKDIR_FAILED gettext("mkdir of %s failed: %s\n") +#define MKDIR_FAILED _("mkdir of %s failed: %s\n") -#define MOUNT_FAILED gettext("mount of %s (fstype %s) failed\n") +#define MOUNT_FAILED _("mount of %s (fstype %s) failed\n") -#define MOUNT_MNTPT_FAILED gettext("mount at %s failed\n") +#define MOUNT_MNTPT_FAILED _("mount at %s failed\n") -#define UMOUNT_FAILED gettext("umount of %s failed\n") +#define UMOUNT_FAILED _("umount of %s failed\n") -#define CANNOT_RESTORE_GRUB_SLICE gettext("cannot restore GRUB slice\n") +#define CANNOT_RESTORE_GRUB_SLICE _("cannot restore GRUB slice\n") -#define RESTORE_GRUB_FAILED gettext("cannot restore GRUB loader\n") +#define RESTORE_GRUB_FAILED _("cannot restore GRUB loader\n") -#define MISSING_BACKUP_MENU gettext("no backup menu %s: %s\n") +#define MISSING_BACKUP_MENU _("no backup menu %s: %s\n") -#define RESTORE_MENU_FAILED gettext("cannot restore menu %s\n") +#define RESTORE_MENU_FAILED _("cannot restore menu %s\n") -#define MISSING_ROOT_FILE gettext("file missing: %s: %s\n") +#define MISSING_ROOT_FILE _("file missing: %s: %s\n") -#define BAD_ROOT_FILE gettext("file is invalid: %s\n") +#define BAD_ROOT_FILE _("file is invalid: %s\n") -#define TRAILING_ARGS gettext("invalid trailing arguments\n") +#define TRAILING_ARGS _("invalid trailing arguments\n") #define RESTORING_GRUB \ - gettext("No GRUB installation found. Restoring GRUB from backup\n") + _("No GRUB installation found. Restoring GRUB from backup\n") #define REBOOT_WITH_ARGS_ADD_ENTRY_FAILED \ - gettext("Cannot update menu. Cannot reboot with requested arguments\n") + _("Cannot update menu. Cannot reboot with requested arguments\n") #define FDISK_FILES_FOUND \ - gettext("Deferred FDISK update file(s) found: %s, %s. Not supported.\n") + _("Deferred FDISK update file(s) found: %s, %s. Not supported.\n") -#define UNKNOWN_KERNEL gettext("unable to expand %s to a full file path.\n") +#define UNKNOWN_KERNEL _("unable to expand %s to a full file path.\n") #define UNKNOWN_KERNEL_REBOOT \ - gettext("Rebooting with default kernel and options.\n") + _("Rebooting with default kernel and options.\n") #define NOT_DBOOT \ - gettext("bootadm set-menu %s may only be run on directboot kernels.\n") + _("bootadm set-menu %s may only be run on directboot kernels.\n") -#define DEFAULT_NOT_BAM gettext( \ +#define DEFAULT_NOT_BAM _( \ "Default /boot/grub/menu.lst entry is not controlled by bootadm. Exiting\n") #define CANT_FIND_DEFAULT \ -gettext("unable to find default boot entry (%d) in menu.lst file.\n") +_("unable to find default boot entry (%d) in menu.lst file.\n") #define UNKNOWN_KERNEL_LINE \ -gettext("kernel command on line %d not recognized.\n") +_("kernel command on line %d not recognized.\n") #define UNKNOWN_MODULE_LINE \ -gettext("module command on line %d not recognized.\n") +_("module command on line %d not recognized.\n") #define FINDROOT_NOT_FOUND \ -gettext("findroot in default boot entry (%d) missing.\n") +_("findroot in default boot entry (%d) missing.\n") #define KERNEL_NOT_FOUND \ -gettext("kernel$ in default boot entry (%d) missing.\n") +_("kernel$ in default boot entry (%d) missing.\n") #define KERNEL_NOT_PARSEABLE \ -gettext("kernel$ in default boot entry (%d) missing or not parseable.\n") +_("kernel$ in default boot entry (%d) missing or not parseable.\n") #define MODULE_NOT_PARSEABLE \ -gettext("module$ in default boot entry (%d) missing or not parseable.\n") +_("module$ in default boot entry (%d) missing or not parseable.\n") -#define NOT_ELF_FILE gettext("%s is not an ELF file.\n") +#define NOT_ELF_FILE _("%s is not an ELF file.\n") -#define WRONG_ELF_CLASS gettext("%s is wrong ELF class 0x%x\n") +#define WRONG_ELF_CLASS _("%s is wrong ELF class 0x%x\n") #define FAILSAFE_MISSING \ -gettext("bootadm -m upgrade run, but the failsafe archives have not been\n\ +_("bootadm -m upgrade run, but the failsafe archives have not been\n\ updated. Not updating line %d\n") #define INVALID_PLAT \ - gettext("invalid platform %s - must be one of sun4u, sun4v or i86pc\n") + _("invalid platform %s - must be one of sun4u, sun4v or i86pc\n") -#define FDISKPART_FAIL gettext("failed to determine fdisk partition: %s\n") +#define FDISKPART_FAIL _("failed to determine fdisk partition: %s\n") -#define INVALID_MHASH_KEY gettext("invalid key for mnttab hash: %s\n") +#define INVALID_MHASH_KEY _("invalid key for mnttab hash: %s\n") -#define INVALID_UFS_SIGNATURE gettext("invalid UFS boot signature: %s\n") +#define INVALID_UFS_SIGNATURE _("invalid UFS boot signature: %s\n") #define SIGN_LIST_FPUTS_ERR \ - gettext("failed to write signature %s to signature list: %s\n") + _("failed to write signature %s to signature list: %s\n") -#define SIGNATURE_LIST_EXISTS gettext(" - signature list %s exists\n") +#define SIGNATURE_LIST_EXISTS _(" - signature list %s exists\n") -#define OPENDIR_FAILED gettext("opendir of %s failed: %s\n") +#define OPENDIR_FAILED _("opendir of %s failed: %s\n") -#define GRUBSIGN_SORT_FAILED gettext("error sorting GRUB UFS boot signatures\n") +#define GRUBSIGN_SORT_FAILED _("error sorting GRUB UFS boot signatures\n") -#define SEARCHING_UFS_SIGN gettext(" - searching for UFS boot signatures\n") +#define SEARCHING_UFS_SIGN _(" - searching for UFS boot signatures\n") -#define ERR_FIND_UFS_SIGN gettext("search for UFS boot signatures failed\n") +#define ERR_FIND_UFS_SIGN _("search for UFS boot signatures failed\n") -#define UFS_SIGNATURE_LIST_MISS gettext("missing UFS signature list file: %s\n") +#define UFS_SIGNATURE_LIST_MISS _("missing UFS signature list file: %s\n") #define UFS_SIGNATURE_LIST_OPENERR \ - gettext("error opening UFS boot signature list file %s: %s\n") + _("error opening UFS boot signature list file %s: %s\n") -#define UFS_BADSIGN gettext("bad UFS boot signature: %s\n") +#define UFS_BADSIGN _("bad UFS boot signature: %s\n") #define GRUBSIGN_BACKUP_OPENERR \ - gettext("error opening boot signature backup file %s: %s\n") + _("error opening boot signature backup file %s: %s\n") #define GRUBSIGN_BACKUP_WRITEERR \ - gettext("error writing boot signature backup file %s: %s\n") + _("error writing boot signature backup file %s: %s\n") #define GRUBSIGN_BACKUP_UPDATED \ - gettext("updated boot signature backup file %s\n") + _("updated boot signature backup file %s\n") #define GRUBSIGN_PRIMARY_CREATERR \ - gettext("error creating primary boot signature %s: %s\n") + _("error creating primary boot signature %s: %s\n") #define GRUBSIGN_PRIMARY_SYNCERR \ - gettext("error syncing primary boot signature %s: %s\n") + _("error syncing primary boot signature %s: %s\n") #define GRUBSIGN_CREATED_PRIMARY \ - gettext("created primary GRUB boot signature: %s\n") + _("created primary GRUB boot signature: %s\n") #define GRUBSIGN_CREATE_FAIL \ - gettext("failed to create GRUB boot signature for device: %s\n") + _("failed to create GRUB boot signature for device: %s\n") #define GRUBSIGN_WRITE_FAIL \ - gettext("failed to write GRUB boot signature for device: %s\n") + _("failed to write GRUB boot signature for device: %s\n") -#define GRUBSIGN_UFS_NONE gettext(" - no existing UFS boot signatures\n") +#define GRUBSIGN_UFS_NONE _(" - no existing UFS boot signatures\n") -#define GRUBSIGN_NOTSUP gettext("boot signature not supported for fstype: %s\n") +#define GRUBSIGN_NOTSUP _("boot signature not supported for fstype: %s\n") #define GRUBSIGN_MKDIR_ERR \ - gettext("error creating boot signature directory %s: %s\n") + _("error creating boot signature directory %s: %s\n") -#define NOT_UFS_SLICE gettext("%s is not a ufs slice: %s\n") +#define NOT_UFS_SLICE _("%s is not a ufs slice: %s\n") -#define FSTYP_FAILED gettext("fstyp failed for slice: %s\n") +#define FSTYP_FAILED _("fstyp failed for slice: %s\n") -#define FSTYP_BAD gettext("bad output from fstyp for slice: %s\n") +#define FSTYP_BAD _("bad output from fstyp for slice: %s\n") -#define ZFS_MOUNT_FAILED gettext("mount of ZFS pool %s failed\n") +#define ZFS_MOUNT_FAILED _("mount of ZFS pool %s failed\n") #define ZFS_MNTPT_FAILED \ - gettext("failed to determine mount point of ZFS pool %s\n") + _("failed to determine mount point of ZFS pool %s\n") -#define NULL_ZFS_MNTPT gettext("ZFS pool %s has no mount-point\n") +#define NULL_ZFS_MNTPT _("ZFS pool %s has no mount-point\n") -#define BAD_ZFS_MNTPT gettext("ZFS pool %s has bad mount-point %s\n") +#define BAD_ZFS_MNTPT _("ZFS pool %s has bad mount-point %s\n") -#define NULL_ZFS_MNTPT gettext("ZFS pool %s has no mount-point\n") +#define NULL_ZFS_MNTPT _("ZFS pool %s has no mount-point\n") -#define BAD_ZFS_MNTED gettext("ZFS pool %s has bad mount status\n") +#define BAD_ZFS_MNTED _("ZFS pool %s has bad mount status\n") #define ZFS_MNTED_FAILED \ - gettext("failed to determine mount status of ZFS pool %s\n") + _("failed to determine mount status of ZFS pool %s\n") #define INT_BAD_MNTSTATE \ - gettext("Internal error: bad saved mount state for pool %s\n") + _("Internal error: bad saved mount state for pool %s\n") -#define FSTYP_A_FAILED gettext("fstyp -a on device %s failed\n") +#define FSTYP_A_FAILED _("fstyp -a on device %s failed\n") -#define NULL_FSTYP_A gettext("NULL fstyp -a output for device %s\n") +#define NULL_FSTYP_A _("NULL fstyp -a output for device %s\n") -#define BAD_FSTYP_A gettext("bad fstyp -a output for device %s\n") +#define BAD_FSTYP_A _("bad fstyp -a output for device %s\n") -#define INVALID_UFS_SIGN gettext("invalid UFS boot signature %s\n") +#define INVALID_UFS_SIGN _("invalid UFS boot signature %s\n") -#define CANT_FIND_SPECIAL gettext("cant find special file for mount-point %s\n") +#define CANT_FIND_SPECIAL _("cant find special file for mount-point %s\n") -#define CANT_FIND_POOL gettext("cant find pool for mount-point %s\n") +#define CANT_FIND_POOL _("cant find pool for mount-point %s\n") -#define NULL_FINDROOT gettext("can't find argument for findroot command\n") +#define NULL_FINDROOT _("can't find argument for findroot command\n") -#define INVALID_DEV_DSK gettext("not a /dev/[r]dsk name: %s\n") +#define INVALID_DEV_DSK _("not a /dev/[r]dsk name: %s\n") -#define CVT_FINDROOT gettext("converting entries to findroot...\n") +#define CVT_FINDROOT _("converting entries to findroot...\n") -#define CVT_HV gettext("adding xVM entries...\n") +#define CVT_HV _("adding xVM entries...\n") -#define CVT_DBOOT gettext("converting entries to dboot...\n") +#define CVT_DBOOT _("converting entries to dboot...\n") #define DOWNGRADE_NOTSUP \ -gettext("automated downgrade of GRUB menu to older version not supported.\n") +_("automated downgrade of GRUB menu to older version not supported.\n") -#define CANT_FIND_GRUBSIGN gettext("cannot find GRUB signature for %s\n") +#define CANT_FIND_GRUBSIGN _("cannot find GRUB signature for %s\n") #define CVT_TODO \ -gettext("one or more GRUB menu entries were not automatically upgraded\n\ +_("one or more GRUB menu entries were not automatically upgraded\n\ For details on manually updating entries, see %s\n") #define CVT_ABORT \ -gettext("error upgrading GRUB menu entries on %s. Aborting.\n\ +_("error upgrading GRUB menu entries on %s. Aborting.\n\ For details on manually updating entries, see %s\n") #define ALREADY_HYPER \ -gettext("default entry already setup for use with the hypervisor!\n") +_("default entry already setup for use with the hypervisor!\n") #define HYPER_ABORT \ -gettext("error converting GRUB menu entry on %s for use with the hypervisor.\n\ +_("error converting GRUB menu entry on %s for use with the hypervisor.\n\ Aborting.\n") #define ALREADY_METAL \ -gettext("default entry already setup for use with a metal kernel!\n") +_("default entry already setup for use with a metal kernel!\n") #define METAL_ABORT \ -gettext("error converting GRUB menu entry on %s for use with a metal kernel.\n\ +_("error converting GRUB menu entry on %s for use with a metal kernel.\n\ Aborting.\n") #define HAND_ADDED_ENTRIES \ -gettext("bootadm(1M) will only upgrade GRUB menu entries added by \n\ +_("bootadm(1M) will only upgrade GRUB menu entries added by \n\ bootadm(1M) or lu(1M). The following entries on %s will not be upgraded.\n\ For details on manually updating entries, see %s\n") #define SIGN_FSTYPE_MISMATCH \ -gettext("found mismatched boot signature %s for filesystem type: %s.\n") +_("found mismatched boot signature %s for filesystem type: %s.\n") #define REBOOT_FSTYPE_FAILED \ -gettext("failed to determine filesystem type for \"/\". Reboot with \n\ +_("failed to determine filesystem type for \"/\". Reboot with \n\ arguments failed.\n") #define REBOOT_SPECIAL_FAILED \ -gettext("failed to find device special file for \"/\". Reboot with \n\ +_("failed to find device special file for \"/\". Reboot with \n\ arguments failed.\n") #define REBOOT_SIGN_FAILED \ -gettext("failed to find boot signature. Reboot with arguments failed.\n") +_("failed to find boot signature. Reboot with arguments failed.\n") #define REBOOT_DIRECT_FAILED \ -gettext("the root filesystem is not a dboot Solaris instance. \n\ +_("the root filesystem is not a dboot Solaris instance. \n\ This version of bootadm is not supported on this version of Solaris.\n") #define BOOTENV_FSTYPE_FAILED \ -gettext("cannot determine filesystem type for \"/\".\n\ +_("cannot determine filesystem type for \"/\".\n\ Cannot generate GRUB menu entry with EEPROM arguments.\n") #define BOOTENV_SPECIAL_FAILED \ -gettext("cannot determine device special file for \"/\".\n\ +_("cannot determine device special file for \"/\".\n\ Cannot generate GRUB menu entry with EEPROM arguments.\n") #define BOOTENV_SIGN_FAILED \ -gettext("cannot determine boot signature for \"/\".\n\ +_("cannot determine boot signature for \"/\".\n\ Cannot generate GRUB menu entry with EEPROM arguments.\n") #define GRUB_SLICE_FILE_EXISTS \ - gettext("unsupported GRUB slice file (%s) exists - ignoring.\n") + _("unsupported GRUB slice file (%s) exists - ignoring.\n") #define GRUBSIGN_FOUND_OR_CREATED \ -gettext("found or created GRUB signature %s for %s\n") +_("found or created GRUB signature %s for %s\n") -#define GET_FSTYPE_ARGS gettext("no OS mountpoint. Cannot determine fstype\n") +#define GET_FSTYPE_ARGS _("no OS mountpoint. Cannot determine fstype\n") #define MNTTAB_MNTPT_NOT_FOUND \ - gettext("failed to find OS mountpoint %s in %s\n") + _("failed to find OS mountpoint %s in %s\n") -#define MNTTAB_FSTYPE_NULL gettext("NULL fstype found for OS root %s\n") +#define MNTTAB_FSTYPE_NULL _("NULL fstype found for OS root %s\n") -#define MISSING_ARG gettext("missing argument for sub-command\n") +#define MISSING_ARG _("missing argument for sub-command\n") -#define INVALID_BINARY gettext("invalid or corrupted binary: %s\n") +#define INVALID_BINARY _("invalid or corrupted binary: %s\n") -#define PCFS_ROOT_NOTSUP gettext("root <%s> on PCFS is not supported\n") +#define PCFS_ROOT_NOTSUP _("root <%s> on PCFS is not supported\n") -#define NO_O_OSROOT gettext("OS root not specified with -o option: %s\n") +#define NO_O_OSROOT _("OS root not specified with -o option: %s\n") #define RDONLY_FS \ - gettext("%s filesystem is read-only, skipping archives update\n") + _("%s filesystem is read-only, skipping archives update\n") -#define RDONLY_TEST_ERROR gettext("error during read-only test on %s: %s\n") +#define RDONLY_TEST_ERROR _("error during read-only test on %s: %s\n") #define CANNOT_GRUBROOT_BOOTDISK \ - gettext("cannot get (hd?,?,?) for menu. menu not on bootdisk: %s\n") + _("cannot get (hd?,?,?) for menu. menu not on bootdisk: %s\n") #define NO_GRUBROOT_FOR_DISK \ - gettext("cannot determine BIOS disk ID 'hd?' for disk: %s\n") + _("cannot determine BIOS disk ID 'hd?' for disk: %s\n") -#define CACHE_MNTTAB_FAIL gettext("%s: failed to cache /etc/mnttab\n") +#define CACHE_MNTTAB_FAIL _("%s: failed to cache /etc/mnttab\n") -#define FAILED_ADD_SIGNLIST gettext("failed to add sign %s to signlist.\n") +#define FAILED_ADD_SIGNLIST _("failed to add sign %s to signlist.\n") -#define GRUBSIGN_BACKUP_MKDIRERR gettext("mkdirp() of backup dir failed: %s\n") +#define GRUBSIGN_BACKUP_MKDIRERR _("mkdirp() of backup dir failed: %s: %s\n") -#define GET_POOL_FAILED gettext("failed to get pool name from %s\n") +#define GET_POOL_FAILED _("failed to get pool name from %s\n") -#define FAIL_MNT_TOP_DATASET gettext("failed to mount top dataset for %s\n") +#define FAIL_MNT_TOP_DATASET _("failed to mount top dataset for %s\n") -#define PRIMARY_SIGN_EXISTS gettext("primary sign %s exists\n") +#define PRIMARY_SIGN_EXISTS _("primary sign %s exists\n") -#define SET_BACKUP_FAILED gettext("failed to set backup sign (%s) for %s: %s\n") +#define SET_BACKUP_FAILED _("failed to set backup sign (%s) for %s: %s\n") #define SET_PRIMARY_FAILED \ -gettext("failed to set primary sign (%s) for %s: %s\n") +_("failed to set primary sign (%s) for %s: %s\n") -#define GET_FSTYPE_FAILED gettext("failed to get fstype for %s\n") +#define GET_FSTYPE_FAILED _("failed to get fstype for %s\n") #define GET_SPECIAL_NULL_MNTPT \ - gettext("cannot get special file: NULL mount-point\n") + _("cannot get special file: NULL mount-point\n") #define GET_SPECIAL_NULL \ - gettext("cannot get special file for mount-point: %s\n") + _("cannot get special file for mount-point: %s\n") #define GET_PHYSICAL_MENU_NULL \ - gettext("cannot get physical device special file for menu root: %s\n") + _("cannot get physical device special file for menu root: %s\n") #define GET_GRUBSIGN_ERROR \ - gettext("failed to get grubsign for root: %s, device %s\n") + _("failed to get grubsign for root: %s, device %s\n") #define FAILED_TO_ADD_BOOT_ENTRY \ - gettext("failed to add boot entry with title=%s, grub signature=%s\n") + _("failed to add boot entry with title=%s, grub signature=%s\n") -#define SET_DEFAULT_FAILED gettext("failed to set GRUB menu default to %d\n") +#define SET_DEFAULT_FAILED _("failed to set GRUB menu default to %d\n") #define REBOOT_GET_KERNEL_FAILED \ -gettext("reboot with arguments: error querying current boot-file settings\n") +_("reboot with arguments: error querying current boot-file settings\n") #define REBOOT_GET_ARGS_FAILED \ -gettext("reboot with arguments: error querying current boot-args settings\n") +_("reboot with arguments: error querying current boot-args settings\n") #define REBOOT_SET_DEFAULT_FAILED \ -gettext("reboot with arguments: setting GRUB menu default to %d failed\n") +_("reboot with arguments: setting GRUB menu default to %d failed\n") -#define GET_SET_KERNEL_ADD_BOOT_ENTRY gettext("failed to add boot entry: %s\n") +#define GET_SET_KERNEL_ADD_BOOT_ENTRY _("failed to add boot entry: %s\n") -#define GET_SET_KERNEL_SET_GLOBAL gettext("failed to set default to: %d\n") +#define GET_SET_KERNEL_SET_GLOBAL _("failed to set default to: %d\n") -#define NO_OPTION_ARG gettext("option has no argument: %s\n") +#define NO_OPTION_ARG _("option has no argument: %s\n") #define CANT_MOUNT_POOL_DATASET \ - gettext("cannot mount pool dataset for pool: %s\n") + _("cannot mount pool dataset for pool: %s\n") -#define ZFS_GET_POOL_FAILED gettext("failed to get pool for device: %s\n") +#define ZFS_GET_POOL_FAILED _("failed to get pool for device: %s\n") #define ZFS_MOUNT_TOP_DATASET_FAILED \ - gettext("failed to mount top dataset for pool: %s\n") + _("failed to mount top dataset for pool: %s\n") -#define GET_POOL_OSDEV_NULL gettext("NULL device: cannot determine pool name\n") +#define GET_POOL_OSDEV_NULL _("NULL device: cannot determine pool name\n") #define GET_POOL_BAD_OSDEV \ -gettext("invalid device %s: cannot determine pool name\n") +_("invalid device %s: cannot determine pool name\n") #define POOL_SIGN_INCOMPAT \ -gettext("pool name %s not present in signature %s\n") +_("pool name %s not present in signature %s\n") #define INVALID_ZFS_SPECIAL \ -gettext("invalid device for ZFS filesystem: %s\n") +_("invalid device for ZFS filesystem: %s\n") #define CANT_FIND_POOL_FROM_SPECIAL \ -gettext("cannot derive ZFS pool from special: %s\n") +_("cannot derive ZFS pool from special: %s\n") #define ZFS_GET_POOL_STATUS \ -gettext("cannot get zpool status for pool: %s\n") +_("cannot get zpool status for pool: %s\n") #define BAD_ZPOOL_STATUS \ -gettext("bad zpool status for pool=%s\n") +_("bad zpool status for pool=%s\n") #define NO_POOL_IN_ZPOOL_STATUS \ -gettext("no pool name %s in zpool status\n") +_("no pool name %s in zpool status\n") #define NO_PHYS_IN_ZPOOL_STATUS \ -gettext("no physical device in zpool status for pool=%s\n") +_("no physical device in zpool status for pool=%s\n") #define UFS_GET_PHYS_NOT_SVM \ -gettext("not a SVM metadevice: %s. Cannot derive physical device\n") +_("not a SVM metadevice: %s. Cannot derive physical device\n") #define UFS_GET_PHYS_INVALID_SVM \ -gettext("invalid SVM metadevice name: %s. Cannot derive physical device\n") +_("invalid SVM metadevice name: %s. Cannot derive physical device\n") #define UFS_SVM_METASTAT_ERR \ -gettext("metastat command failed on SVM metadevice: %s\n") +_("metastat command failed on SVM metadevice: %s\n") #define UFS_SVM_METASTAT_SVC_ERR \ -gettext("failed to start service %s for metastat command\n") +_("failed to start service %s for metastat command\n") #define BAD_UFS_SVM_METASTAT \ -gettext("bad output from metastat command on SVM metadevice: %s\n") +_("bad output from metastat command on SVM metadevice: %s\n") #define INVALID_UFS_SVM_METASTAT \ -gettext("invalid fields in metastat output for SVM metadevice: %s\n") +_("invalid fields in metastat output for SVM metadevice: %s\n") #define CANNOT_PARSE_UFS_SVM_METASTAT \ -gettext("cannot parse output of metastat command for metadevice: %s\n") +_("cannot parse output of metastat command for metadevice: %s\n") #define CANNOT_PARSE_UFS_SVM_SUBMIRROR \ -gettext("cannot parse submirror line in metastat output for metadevice: %s\n") +_("cannot parse submirror line in metastat output for metadevice: %s\n") #define GET_PHYSICAL_NOTSUP_FSTYPE \ -gettext("cannot derive physical device for %s (%s), unsupported filesystem\n") +_("cannot derive physical device for %s (%s), unsupported filesystem\n") #define ERROR_PARSE_UFS_SVM_METASTAT \ -gettext("error parsing metastat output for SVM metadevice: %s\n") +_("error parsing metastat output for SVM metadevice: %s\n") #define GET_OSROOT_SPECIAL_ERR \ -gettext("failed to get special file for osroot: %s\n") +_("failed to get special file for osroot: %s\n") #define GET_MENU_ROOT_SPECIAL_ERR \ -gettext("failed to get special file for menu_root: %s\n") +_("failed to get special file for menu_root: %s\n") -#define GET_SVC_STATE_ERR gettext("failed to determine state of service: %s\n") +#define GET_SVC_STATE_ERR _("failed to determine state of service: %s\n") #define SVC_IS_ONLINE_FAILED \ - gettext("failed to determine if service is online: %s\n") + _("failed to determine if service is online: %s\n") -#define ENABLE_SVC_FAILED gettext("failed to online service: %s\n") +#define ENABLE_SVC_FAILED _("failed to online service: %s\n") #define ERR_SVC_GET_ONLINE \ - gettext("failed to get online status for service: %s\n") + _("failed to get online status for service: %s\n") #define TIMEOUT_ENABLE_SVC \ - gettext("timed out waiting for service to online: %s\n") + _("timed out waiting for service to online: %s\n") #define CANNOT_READ_LU_CKSUM \ - gettext("failed to read GRUB menu checksum file: %s\n") + _("failed to read GRUB menu checksum file: %s\n") #define MULTIPLE_LU_CKSUM \ - gettext("multiple checksums for GRUB menu in checksum file: %s\n") + _("multiple checksums for GRUB menu in checksum file: %s\n") #define CANNOT_PARSE_LU_CKSUM \ - gettext("error parsing GRUB menu checksum file: %s\n") + _("error parsing GRUB menu checksum file: %s\n") #define MENU_CKSUM_FAIL \ - gettext("error generating checksum of GRUB menu\n") + _("error generating checksum of GRUB menu\n") #define BAD_CKSUM \ - gettext("bad checksum generated for GRUB menu\n") + _("bad checksum generated for GRUB menu\n") #define BAD_CKSUM_PARSE \ - gettext("error parsing checksum generated for GRUB menu\n") + _("error parsing checksum generated for GRUB menu\n") #define MENU_PROP_FAIL \ - gettext("error propagating updated GRUB menu\n") + _("error propagating updated GRUB menu\n") #define MENU_BACKUP_FAIL \ - gettext("failed to create backup for GRUB menu: %s\n") + _("failed to create backup for GRUB menu: %s\n") #define BACKUP_PROP_FAIL \ - gettext("error propagating backup GRUB menu: %s\n") + _("error propagating backup GRUB menu: %s\n") #define MENU_CKSUM_WRITE_FAIL \ - gettext("failed to write GRUB menu checksum file: %s\n") + _("failed to write GRUB menu checksum file: %s\n") #define MENU_CKSUM_PROP_FAIL \ - gettext("error propagating GRUB menu checksum file: %s\n") + _("error propagating GRUB menu checksum file: %s\n") #define BOOTADM_PROP_FAIL \ - gettext("error propagating bootadm: %s\n") + _("error propagating bootadm: %s\n") #define PROP_GRUB_MENU \ - gettext("propagating updated GRUB menu\n") + _("propagating updated GRUB menu\n") -#define NEED_DIRPATH gettext("need to create directory path for %s\n") +#define NEED_DIRPATH _("need to create directory path for %s\n") -#define UPDT_CACHE_FAIL gettext("directory cache update failed for %s\n") +#define UPDT_CACHE_FAIL _("directory cache update failed for %s\n") #define NEW_BOOT_ENTRY \ - gettext("unable to modify default entry; creating new boot entry for %s\n") + _("unable to modify default entry; creating new boot entry for %s\n") /* * NOTE: The following are debug messages and not I18Ned -- 2.11.4.GIT