diff -Naur old/grub-core/fs/archelp.c new/grub-core/fs/archelp.c --- old/grub-core/fs/archelp.c 2014-10-17 10:08:15.378948671 +0000 +++ new/grub-core/fs/archelp.c 2014-10-17 10:49:16.894630691 +0000 @@ -213,7 +213,7 @@ if (++symlinknest == 8) { grub_error (GRUB_ERR_SYMLINK_LOOP, - N_("too deep nesting of symlinks")); + N_("archelp: too deep nesting of symlinks")); goto fail; } arcops->rewind (data); @@ -256,7 +256,7 @@ if (mode == GRUB_ARCHELP_ATTR_END) { - grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), name_in); + grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("archelp: file `%s' not found"), name_in); break; } @@ -274,7 +274,7 @@ if (++symlinknest == 8) { grub_error (GRUB_ERR_SYMLINK_LOOP, - N_("too deep nesting of symlinks")); + N_("archelp: too deep nesting of symlinks")); goto fail; } goto no_match; diff -Naur old/grub-core/fs/bfs.c new/grub-core/fs/bfs.c --- old/grub-core/fs/bfs.c 2014-10-17 10:08:15.378948671 +0000 +++ new/grub-core/fs/bfs.c 2014-10-17 11:08:03.665543197 +0000 @@ -619,7 +619,7 @@ if (node->count_keys == 0) { grub_free (node); - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("bfs: file `%s' not found"), name); } @@ -702,7 +702,7 @@ continue; } grub_free (node); - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("bfs: file `%s' not found"), name); } } @@ -717,7 +717,7 @@ grub_uint64_t res = 0; if (((grub_bfs_to_cpu32 (ino->mode) & ATTR_TYPE) != ATTR_DIR)) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("bfs: not a directory")); err = find_in_b_tree (disk, sb, ino, name, name_end - name, &res); if (err) @@ -768,7 +768,7 @@ { grub_free (alloc); return grub_error (GRUB_ERR_SYMLINK_LOOP, - N_("too deep nesting of symlinks")); + N_("bfs: too deep nesting of symlinks")); } #ifndef MODE_AFS @@ -913,7 +913,7 @@ if (err) return err; if (((grub_bfs_to_cpu32 (ino.mode) & ATTR_TYPE) != ATTR_DIR)) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("bfs: not a directory")); iterate_in_b_tree (device->disk, &ctx.sb, &ino, grub_bfs_dir_iter, &ctx); } @@ -938,7 +938,7 @@ if (err) return err; if (((grub_bfs_to_cpu32 (ino.mode) & ATTR_TYPE) != ATTR_REG)) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("bfs: not a regular file")); data = grub_zalloc (sizeof (struct grub_bfs_data)); if (!data) diff -Naur old/grub-core/fs/btrfs.c new/grub-core/fs/btrfs.c --- old/grub-core/fs/btrfs.c 2014-10-17 10:08:15.342281542 +0000 +++ new/grub-core/fs/btrfs.c 2014-10-17 11:04:57.847623960 +0000 @@ -762,12 +762,12 @@ default: grub_dprintf ("btrfs", "unsupported RAID\n"); return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "unsupported RAID flags %" PRIxGRUB_UINT64_T, + "btrfs: unsupported RAID flags %" PRIxGRUB_UINT64_T, grub_le_to_cpu64 (chunk->type)); } if (csize == 0) return grub_error (GRUB_ERR_BUG, - "couldn't find the chunk descriptor"); + "btrfs: couldn't find the chunk descriptor"); if (csize > (grub_uint64_t) size) csize = size; @@ -1074,7 +1074,7 @@ if (data->extent->encryption) { grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "encryption not supported"); + "btrfs: encryption not supported"); return -1; } @@ -1083,14 +1083,14 @@ && data->extent->compression != GRUB_BTRFS_COMPRESSION_LZO) { grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "compression type 0x%x not supported", + "btrfs: compression type 0x%x not supported", data->extent->compression); return -1; } if (data->extent->encoding) { - grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "encoding not supported"); + grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "btrfs: encoding not supported"); return -1; } @@ -1107,7 +1107,7 @@ { if (!grub_errno) grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "premature end of compressed"); + "btrfs: premature end of compressed"); return -1; } } @@ -1166,7 +1166,7 @@ { if (!grub_errno) grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "premature end of compressed"); + "btrfs: premature end of compressed"); return -1; } @@ -1181,7 +1181,7 @@ break; default: grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "unsupported extent type 0x%x", data->extent->type); + "btrfs: unsupported extent type 0x%x", data->extent->type); return -1; } buf += csize; @@ -1267,7 +1267,7 @@ { grub_free (path_alloc); grub_free (origpath); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("btrfs: not a directory")); } if (ctokenlen == 1 && ctoken[0] == '.') @@ -1295,7 +1295,7 @@ { grub_free (direl); grub_free (path_alloc); - err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("btrfs: file `%s' not found"), origpath); grub_free (origpath); return err; } @@ -1324,7 +1324,7 @@ { grub_free (direl); grub_free (path_alloc); - err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("btrfs: file `%s' not found"), origpath); grub_free (origpath); return err; } @@ -1368,7 +1368,7 @@ { grub_free (direl); grub_free (path_alloc); - err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("btrfs: file `%s' not found"), origpath); grub_free (origpath); return err; } @@ -1384,7 +1384,7 @@ grub_free (path_alloc); grub_free (origpath); return grub_error (GRUB_ERR_SYMLINK_LOOP, - N_("too deep nesting of symlinks")); + N_("btrfs: too deep nesting of symlinks")); } err = grub_btrfs_read_inode (data, &inode, @@ -1451,7 +1451,7 @@ { grub_free (direl); grub_free (path_alloc); - err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("btrfs: file `%s' not found"), origpath); grub_free (origpath); return err; } @@ -1475,7 +1475,7 @@ { grub_free (direl); grub_free (path_alloc); - err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + err = grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("btrfs: file `%s' not found"), origpath); grub_free (origpath); return err; } @@ -1526,7 +1526,7 @@ if (type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY) { grub_btrfs_unmount (data); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("btrfs: not a directory")); } err = lower_bound (data, &key_in, &key_out, tree, @@ -1632,7 +1632,7 @@ if (type != GRUB_BTRFS_DIR_ITEM_TYPE_REGULAR) { grub_btrfs_unmount (data); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("btrfs: not a regular file")); } data->inode = key_in.object_id; diff -Naur old/grub-core/fs/cbfs.c new/grub-core/fs/cbfs.c --- old/grub-core/fs/cbfs.c 2014-10-17 10:08:15.342281542 +0000 +++ new/grub-core/fs/cbfs.c 2014-10-17 10:55:47.350586733 +0000 @@ -287,7 +287,7 @@ grub_cbfsdisk_open (const char *name, grub_disk_t disk) { if (grub_strcmp (name, "cbfsdisk")) - return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a cbfsdisk"); + return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "cbfs: not a cbfsdisk"); disk->total_sectors = cbfsdisk_size / GRUB_DISK_SECTOR_SIZE; disk->max_agglomerate = GRUB_DISK_MAX_MAX_AGGLOMERATE; @@ -318,7 +318,7 @@ const char *buf __attribute__ ((unused))) { return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "rom flashing isn't implemented yet"); + "cbfs: rom flashing isn't implemented yet"); } static struct grub_disk_dev grub_cbfsdisk_dev = diff -Naur old/grub-core/fs/fat.c new/grub-core/fs/fat.c --- old/grub-core/fs/fat.c 2014-10-17 10:08:15.342281542 +0000 +++ new/grub-core/fs/fat.c 2014-10-17 10:49:48.871512131 +0000 @@ -867,7 +867,7 @@ if (! (data->attr & GRUB_FAT_ATTR_DIRECTORY)) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("fat: not a directory")); return 0; } @@ -950,7 +950,7 @@ err = 0; if (grub_errno == GRUB_ERR_NONE && ! found && !call_hook) - grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("fat: file `%s' not found"), origpath); fail: grub_free (dirname); @@ -1024,7 +1024,7 @@ if (data->attr & GRUB_FAT_ATTR_DIRECTORY) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("fat: not a regular file")); goto fail; } @@ -1135,7 +1135,7 @@ if (! (data->attr & GRUB_FAT_ATTR_DIRECTORY)) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("fat: not a directory")); return 0; } diff -Naur old/grub-core/fs/fshelp.c new/grub-core/fs/fshelp.c --- old/grub-core/fs/fshelp.c 2014-10-17 10:08:15.375615352 +0000 +++ new/grub-core/fs/fshelp.c 2014-10-17 11:07:07.085160204 +0000 @@ -114,7 +114,7 @@ { free_node (ctx->currnode, ctx); ctx->currnode = 0; - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("fshelp: not a directory")); } /* Iterate over the directory. */ @@ -143,7 +143,7 @@ ctx->currnode = 0; ctx->oldnode = 0; return grub_error (GRUB_ERR_SYMLINK_LOOP, - N_("too deep nesting of symlinks")); + N_("fshelp: too deep nesting of symlinks")); } symlink = read_symlink (ctx->currnode); @@ -189,7 +189,7 @@ ctx->name = ctx->next; } - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("fshelp: file `%s' not found"), ctx->path); } @@ -217,7 +217,7 @@ if (!path || path[0] != '/') { - grub_error (GRUB_ERR_BAD_FILENAME, N_("invalid file name `%s'"), path); + grub_error (GRUB_ERR_BAD_FILENAME, N_("fshelp: invalid file name `%s'"), path); return grub_errno; } @@ -227,9 +227,9 @@ /* Check if the node that was found was of the expected type. */ if (expecttype == GRUB_FSHELP_REG && ctx.foundtype != expecttype) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("fshelp: not a regular file")); else if (expecttype == GRUB_FSHELP_DIR && ctx.foundtype != expecttype) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("fshelp: not a directory")); return 0; } diff -Naur old/grub-core/fs/hfs.c new/grub-core/fs/hfs.c --- old/grub-core/fs/hfs.c 2014-10-17 10:08:15.342281542 +0000 +++ new/grub-core/fs/hfs.c 2014-10-17 10:46:43.073598590 +0000 @@ -1131,7 +1131,7 @@ if (path[0] != '/') { - grub_error (GRUB_ERR_BAD_FILENAME, N_("invalid file name `%s'"), path); + grub_error (GRUB_ERR_BAD_FILENAME, N_("hfs: invalid file name `%s'"), path); return 0; } @@ -1148,7 +1148,7 @@ grub_ssize_t slen; if (fdrec.frec.type != GRUB_HFS_FILETYPE_DIR) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("hfs: not a directory")); goto fail; } @@ -1166,7 +1166,7 @@ slen = utf8_to_macroman (key.str, path); if (slen < 0) { - grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), path); + grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("hfs: file `%s' not found"), path); goto fail; } key.strlen = slen; @@ -1175,7 +1175,7 @@ if (! grub_hfs_find_node (data, (char *) &key, data->cat_root, 0, (char *) &fdrec.frec, sizeof (fdrec.frec))) { - grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), origpath); + grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("hfs: file `%s' not found"), origpath); goto fail; } @@ -1274,7 +1274,7 @@ if (frec.type != GRUB_HFS_FILETYPE_DIR) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("hfs: not a directory")); goto fail; } @@ -1310,7 +1310,7 @@ if (frec.type != GRUB_HFS_FILETYPE_FILE) { grub_free (data); - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("hfs: not a regular file")); grub_dl_unref (my_mod); return grub_errno; } diff -Naur old/grub-core/fs/hfsplus.c new/grub-core/fs/hfsplus.c --- old/grub-core/fs/hfsplus.c 2014-10-17 10:08:15.378948671 +0000 +++ new/grub-core/fs/hfsplus.c 2014-10-17 10:44:41.026113511 +0000 @@ -172,7 +172,7 @@ if (node->fileid == GRUB_HFSPLUS_FILEID_OVERFLOW) { grub_error (GRUB_ERR_READ_ERROR, - "extra extents found in an extend overflow file"); + "hfsplus: extra extents found in an extend overflow file"); break; } @@ -187,7 +187,7 @@ || !nnode) { grub_error (GRUB_ERR_READ_ERROR, - "no block found for the file id 0x%x and the block offset 0x%x", + "hfsplus: no block found for the file id 0x%x and the block offset 0x%x", node->fileid, fileblock); break; } diff -Naur old/grub-core/fs/hfspluscomp.c new/grub-core/fs/hfspluscomp.c --- old/grub-core/fs/hfspluscomp.c 2014-10-17 10:08:15.378948671 +0000 +++ new/grub-core/fs/hfspluscomp.c 2014-10-17 10:48:43.727739010 +0000 @@ -160,7 +160,7 @@ { if (!grub_errno) grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "premature end of compressed"); + "hfspluscomp: premature end of compressed"); grub_free (tmp_buf); return -1; @@ -297,7 +297,7 @@ { if (!grub_errno) grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "premature end of compressed"); + "hfspluscomp: premature end of compressed"); return grub_errno; } node->compressed = 1; diff -Naur old/grub-core/fs/iso9660.c new/grub-core/fs/iso9660.c --- old/grub-core/fs/iso9660.c 2014-10-17 10:08:15.338948093 +0000 +++ new/grub-core/fs/iso9660.c 2014-10-17 11:05:23.257795263 +0000 @@ -189,7 +189,7 @@ && ! i->minute[0] && ! i->minute[1] && ! i->second[0] && ! i->second[1] && ! i->hundredth[0] && ! i->hundredth[1]) - return grub_error (GRUB_ERR_BAD_NUMBER, "empty date"); + return grub_error (GRUB_ERR_BAD_NUMBER, "iso9660: empty date"); datetime.year = (i->year[0] - '0') * 1000 + (i->year[1] - '0') * 100 + (i->year[2] - '0') * 10 + (i->year[3] - '0'); datetime.month = (i->month[0] - '0') * 10 + (i->month[1] - '0'); @@ -199,7 +199,7 @@ datetime.second = (i->second[0] - '0') * 10 + (i->second[1] - '0'); if (!grub_datetime2unixtime (&datetime, nix)) - return grub_error (GRUB_ERR_BAD_NUMBER, "incorrect date"); + return grub_error (GRUB_ERR_BAD_NUMBER, "iso9660: incorrect date"); *nix -= i->offset * 60 * 15; return GRUB_ERR_NONE; } @@ -1037,7 +1037,7 @@ && ! data->voldesc.modified.second[0] && ! data->voldesc.modified.second[1] && ! data->voldesc.modified.hundredth[0] && ! data->voldesc.modified.hundredth[1]) { - grub_error (GRUB_ERR_BAD_NUMBER, "no creation date in filesystem to generate UUID"); + grub_error (GRUB_ERR_BAD_NUMBER, "iso9660: no creation date in filesystem to generate UUID"); *uuid = NULL; } else diff -Naur old/grub-core/fs/jfs.c new/grub-core/fs/jfs.c --- old/grub-core/fs/jfs.c 2014-10-17 10:08:15.375615352 +0000 +++ new/grub-core/fs/jfs.c 2014-10-17 11:02:48.470086270 +0000 @@ -428,7 +428,7 @@ if (!((grub_le_to_cpu32 (inode->mode) & GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_DIR)) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("jfs: not a directory")); return 0; } @@ -686,7 +686,7 @@ if (grub_jfs_getent (diro) == GRUB_ERR_OUT_OF_RANGE) { grub_jfs_closedir (diro); - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), path); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("jfs: file `%s' not found"), path); } /* Check if the current direntry matches the current part of the @@ -726,7 +726,7 @@ char *symlink; if (++data->linknest > GRUB_JFS_MAX_SYMLNK_CNT) - return grub_error (GRUB_ERR_SYMLINK_LOOP, N_("too deep nesting of symlinks")); + return grub_error (GRUB_ERR_SYMLINK_LOOP, N_("jfs: too deep nesting of symlinks")); symlink = grub_malloc (size + 1); if (!symlink) @@ -825,7 +825,7 @@ if (! ((grub_le_to_cpu32 (data->currinode.mode) & GRUB_JFS_FILETYPE_MASK) == GRUB_JFS_FILETYPE_REG)) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("jfs: not a regular file")); goto fail; } diff -Naur old/grub-core/fs/minix.c new/grub-core/fs/minix.c --- old/grub-core/fs/minix.c 2014-10-17 10:08:15.378948671 +0000 +++ new/grub-core/fs/minix.c 2014-10-17 10:55:04.596966030 +0000 @@ -356,7 +356,7 @@ grub_size_t sz = GRUB_MINIX_INODE_SIZE (data); if (++data->linknest > GRUB_MINIX_MAX_SYMLNK_CNT) - return grub_error (GRUB_ERR_SYMLINK_LOOP, N_("too deep nesting of symlinks")); + return grub_error (GRUB_ERR_SYMLINK_LOOP, N_("minix: too deep nesting of symlinks")); symlink = grub_malloc (sz + 1); if (!symlink) @@ -401,7 +401,7 @@ if ((GRUB_MINIX_INODE_MODE (data) & GRUB_MINIX_IFDIR) != GRUB_MINIX_IFDIR) - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("minix: not a directory")); /* Extract the actual part from the pathname. */ for (next = name; *next && *next != '/'; next++); @@ -413,7 +413,7 @@ if (pos >= GRUB_MINIX_INODE_SIZE (data)) { - grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), path); + grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("minix: file `%s' not found"), path); return grub_errno; } @@ -543,7 +543,7 @@ if ((GRUB_MINIX_INODE_MODE (data) & GRUB_MINIX_IFDIR) != GRUB_MINIX_IFDIR) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("minix: not a directory")); goto fail; } @@ -611,7 +611,7 @@ if (!name || name[0] != '/') { - grub_error (GRUB_ERR_BAD_FILENAME, N_("invalid file name `%s'"), name); + grub_error (GRUB_ERR_BAD_FILENAME, N_("minix: invalid file name `%s'"), name); return grub_errno; } diff -Naur old/grub-core/fs/proc.c new/grub-core/fs/proc.c --- old/grub-core/fs/proc.c 2014-10-17 10:08:15.375615352 +0000 +++ new/grub-core/fs/proc.c 2014-10-17 11:05:58.668035846 +0000 @@ -41,7 +41,7 @@ grub_procdev_open (const char *name, grub_disk_t disk) { if (grub_strcmp (name, "proc")) - return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not a procfs disk"); + return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "proc: not a procfs disk"); disk->total_sectors = 0; disk->id = 0; @@ -136,7 +136,7 @@ return GRUB_ERR_NONE; } - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), path); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("proc: file `%s' not found"), path); } static struct grub_disk_dev grub_procfs_dev = { diff -Naur old/grub-core/fs/reiserfs.c new/grub-core/fs/reiserfs.c --- old/grub-core/fs/reiserfs.c 2014-10-17 10:08:15.375615352 +0000 +++ new/grub-core/fs/reiserfs.c 2014-10-17 10:50:30.905127614 +0000 @@ -604,7 +604,7 @@ { if (i == 0) { - grub_error (GRUB_ERR_READ_ERROR, "unexpected btree node"); + grub_error (GRUB_ERR_READ_ERROR, "reiserfs: unexpected btree node"); goto fail; } i--; @@ -616,7 +616,7 @@ { if (i == 0) { - grub_error (GRUB_ERR_READ_ERROR, "unexpected btree node"); + grub_error (GRUB_ERR_READ_ERROR, "reiserfs: unexpected btree node"); goto fail; } i--; @@ -729,7 +729,7 @@ if (item->type != GRUB_REISERFS_DIRECTORY) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("reiserfs: not a directory")); goto fail; } block_size = grub_le_to_cpu16 (data->superblock.block_size); @@ -1070,7 +1070,7 @@ if (found.block_number == 0) { - grub_error (GRUB_ERR_READ_ERROR, "offset %lld not found", + grub_error (GRUB_ERR_READ_ERROR, "reiserfs: offset %lld not found", (unsigned long long) initial_position); goto fail; } diff -Naur old/grub-core/fs/squash4.c new/grub-core/fs/squash4.c --- old/grub-core/fs/squash4.c 2014-10-17 10:08:15.342281542 +0000 +++ new/grub-core/fs/squash4.c 2014-10-17 10:52:38.759319496 +0000 @@ -345,7 +345,7 @@ if (xzret != XZ_OK && xzret != XZ_STREAM_END) { - grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "invalid xz chunk"); + grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, "squash4: invalid xz chunk"); return -1; } if (pos + buf.out_pos >= off) diff -Naur old/grub-core/fs/ufs.c new/grub-core/fs/ufs.c --- old/grub-core/fs/ufs.c 2014-10-17 10:08:15.342281542 +0000 +++ new/grub-core/fs/ufs.c 2014-10-17 11:02:24.029922629 +0000 @@ -451,7 +451,7 @@ grub_size_t sz = INODE_SIZE (data); if (++data->linknest > GRUB_UFS_MAX_SYMLNK_CNT) - return grub_error (GRUB_ERR_SYMLINK_LOOP, N_("too deep nesting of symlinks")); + return grub_error (GRUB_ERR_SYMLINK_LOOP, N_("ufs: too deep nesting of symlinks")); symlink = grub_malloc (sz + 1); if (!symlink) @@ -522,7 +522,7 @@ != GRUB_UFS_ATTR_DIR) { grub_error (GRUB_ERR_BAD_FILE_TYPE, - N_("not a directory")); + N_("ufs: not a directory")); goto fail; } @@ -535,7 +535,7 @@ if (pos >= INODE_SIZE (data)) { grub_error (GRUB_ERR_FILE_NOT_FOUND, - N_("file `%s' not found"), + N_("ufs: file `%s' not found"), path); goto fail; } @@ -651,7 +651,7 @@ if (!path || path[0] != '/') { - grub_error (GRUB_ERR_BAD_FILENAME, N_("invalid file name `%s'"), path); + grub_error (GRUB_ERR_BAD_FILENAME, N_("ufs: invalid file name `%s'"), path); return grub_errno; } @@ -661,7 +661,7 @@ if ((INODE_MODE (data) & GRUB_UFS_ATTR_TYPE) != GRUB_UFS_ATTR_DIR) { - grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("ufs: not a directory")); goto fail; } @@ -747,7 +747,7 @@ if (!name || name[0] != '/') { - grub_error (GRUB_ERR_BAD_FILENAME, N_("invalid file name `%s'"), name); + grub_error (GRUB_ERR_BAD_FILENAME, N_("ufs: invalid file name `%s'"), name); return grub_errno; } diff -Naur old/grub-core/fs/zfs/zfs.c new/grub-core/fs/zfs/zfs.c --- old/grub-core/fs/zfs/zfs.c 2014-10-17 10:08:15.375615352 +0000 +++ new/grub-core/fs/zfs/zfs.c 2014-10-17 11:01:55.359728800 +0000 @@ -298,7 +298,7 @@ if (!grub_errno) grub_error (GRUB_ERR_BAD_COMPRESSED_DATA, - "premature end of compressed"); + "zfs: premature end of compressed"); return grub_errno; } @@ -418,7 +418,7 @@ { grub_dprintf ("zfs", "unknown checksum function %d\n", checksum); return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "unknown checksum function %d", checksum); + "zfs: unknown checksum function %d", checksum); } if (ci->ci_eck) @@ -601,7 +601,7 @@ *nvlist = 0; if (!diskdesc->dev) - return grub_error (GRUB_ERR_BUG, "member drive unknown"); + return grub_error (GRUB_ERR_BUG, "zfs: member drive unknown"); *nvlist = grub_malloc (VDEV_PHYS_SIZE); @@ -742,7 +742,7 @@ return GRUB_ERR_NONE; } - grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "vdev %s isn't supported", type); + grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "zfs: vdev %s isn't supported", type); grub_free (type); return grub_errno; } @@ -1053,7 +1053,7 @@ { grub_free (nvlist); return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "too new version %llu > %llu", + "zfs: too new version %llu > %llu", (unsigned long long) version, (unsigned long long) SPA_VERSION_BEFORE_FEATURES); } @@ -1124,7 +1124,7 @@ if (check_feature(name,1, NULL) != 0) { grub_dprintf("zfs","feature missing in check_pool_label:%s\n",name); - err= grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET," check_pool_label missing feature '%s' for read",name); + err= grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET," zfs: check_pool_label missing feature '%s' for read",name); return err; } } @@ -1440,7 +1440,7 @@ return GRUB_ERR_NONE; } default: - return grub_error (GRUB_ERR_BUG, "too big matrix"); + return grub_error (GRUB_ERR_BUG, "zfs: too big matrix"); } } @@ -1499,7 +1499,7 @@ if (desc->nparity < 1 || desc->nparity > 3) return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "raidz%d is not supported", desc->nparity); + "zfs: raidz%d is not supported", desc->nparity); orig_s = (((len + (1 << desc->ashift) - 1) >> desc->ashift) + (desc->n_children - desc->nparity) - 1); @@ -1827,11 +1827,11 @@ if (comp >= ZIO_COMPRESS_FUNCTIONS) return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "compression algorithm %u not supported\n", (unsigned int) comp); + "zfs: compression algorithm %u not supported\n", (unsigned int) comp); if (comp != ZIO_COMPRESS_OFF && decomp_table[comp].decomp_func == NULL) return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "compression algorithm %s not supported\n", decomp_table[comp].name); + "zfs: compression algorithm %s not supported\n", decomp_table[comp].name); if (comp != ZIO_COMPRESS_OFF) { @@ -2027,7 +2027,7 @@ } } - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), name); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("zfs: file `%s' not found"), name); } static int @@ -2233,7 +2233,7 @@ } } - return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("file `%s' not found"), name); + return grub_error (GRUB_ERR_FILE_NOT_FOUND, N_("zfs: file `%s' not found"), name); } @@ -2276,7 +2276,7 @@ /* get block id from index */ if (zap->zap_ptrtbl.zt_numblks != 0) return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "external pointer tables not supported"); + "zfs: external pointer tables not supported"); idx = ZAP_HASH_IDX (hash, zap->zap_ptrtbl.zt_shift); blkid = grub_zfs_to_cpu64 (((grub_uint64_t *) zap)[idx + (1 << (blksft - 3 - 1))], zap_dnode->endian); @@ -2319,7 +2319,7 @@ if (zap->zap_ptrtbl.zt_numblks != 0) { grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, - "external pointer tables not supported"); + "zfs: external pointer tables not supported"); return 0; } /* Get the leaf block */ @@ -2692,7 +2692,7 @@ if (version > ZPL_VERSION) { grub_free (dn_new); - return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "too new ZPL version"); + return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET, "zfs: too new ZPL version"); } err = zap_lookup (&(dnode_path->dn), "casesensitivity", @@ -2751,7 +2751,7 @@ else { err = grub_error (GRUB_ERR_FILE_NOT_FOUND, - "can't resolve .."); + "zfs: can't resolve .."); break; } continue; @@ -2763,7 +2763,7 @@ if (dnode_path->dn.dn.dn_type != DMU_OT_DIRECTORY_CONTENTS) { grub_free (path_buf); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("zfs: not a directory")); } err = zap_lookup (&(dnode_path->dn), cname, &objnum, data, subvol->case_insensitive); @@ -3549,7 +3549,7 @@ if (! dev->disk) { - grub_error (GRUB_ERR_BAD_DEVICE, "not a disk"); + grub_error (GRUB_ERR_BAD_DEVICE, "zfs: not a disk"); return 0; } @@ -3716,14 +3716,14 @@ if (isfs) { zfs_unmount (data); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("missing `%c' symbol"), '@'); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("zfs: missing `%c' symbol"), '@'); } /* We found the dnode for this file. Verify if it is a plain file. */ if (data->dnode.dn.dn_type != DMU_OT_PLAIN_FILE_CONTENTS) { zfs_unmount (data); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a regular file")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("zfs: not a regular file")); } /* get the file size and set the file position to 0 */ @@ -4158,7 +4158,7 @@ if (data->dnode.dn.dn_type != DMU_OT_DIRECTORY_CONTENTS) { zfs_unmount (data); - return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("not a directory")); + return grub_error (GRUB_ERR_BAD_FILE_TYPE, N_("zfs: not a directory")); } zap_iterate_u64 (&(data->dnode), iterate_zap, data, &ctx); } diff -Naur old/grub-core/fs/zfs/zfscrypt.c new/grub-core/fs/zfs/zfscrypt.c --- old/grub-core/fs/zfs/zfscrypt.c 2014-10-17 10:08:15.372282043 +0000 +++ new/grub-core/fs/zfs/zfscrypt.c 2014-10-17 10:56:50.174342400 +0000 @@ -289,7 +289,7 @@ if (!cipher) return grub_error (GRUB_ERR_ACCESS_DENIED, - N_("no decryption key available")); + N_("zfscrypt: no decryption key available")); err = algo_decrypt (cipher, algo, (grub_uint8_t *) buf, (grub_uint8_t *) buf, diff -Naur old/grub-core/fs/zfs/zfsinfo.c new/grub-core/fs/zfs/zfsinfo.c --- old/grub-core/fs/zfs/zfsinfo.c 2014-10-17 10:08:15.375615352 +0000 +++ new/grub-core/fs/zfs/zfsinfo.c 2014-10-17 10:56:36.704251776 +0000 @@ -274,7 +274,7 @@ int found; if (argc < 1) - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("zfsinfo: one argument expected")); if (args[0][0] == '(' && args[0][grub_strlen (args[0]) - 1] == ')') { @@ -353,7 +353,7 @@ grub_uint64_t mdnobj; if (argc < 1) - return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); + return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("zfsinfo: one argument expected")); devname = grub_file_get_device_name (args[0]); if (grub_errno)