[syslinux:pathbased] core: remove unmangle_name

syslinux-bot for H. Peter Anvin hpa at zytor.com
Sun Feb 28 21:06:09 PST 2010


Commit-ID:  0f767521fd948e2e00263dbf8c9cae7356871881
Gitweb:     http://syslinux.zytor.com/commit/0f767521fd948e2e00263dbf8c9cae7356871881
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sun, 28 Feb 2010 21:04:50 -0800
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Sun, 28 Feb 2010 21:04:50 -0800

core: remove unmangle_name

Remove the now-obsolete unmangle_name method.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 core/fs/btrfs/btrfs.c     |    1 -
 core/fs/ext2/ext2.c       |    1 -
 core/fs/fat/fat.c         |    1 -
 core/fs/fs.c              |   11 +----------
 core/fs/iso9660/iso9660.c |    1 -
 core/fs/pxe/pxe.c         |    1 -
 core/include/fs.h         |    2 --
 7 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/core/fs/btrfs/btrfs.c b/core/fs/btrfs/btrfs.c
index 7e83adf..5aa6935 100644
--- a/core/fs/btrfs/btrfs.c
+++ b/core/fs/btrfs/btrfs.c
@@ -629,6 +629,5 @@ const struct fs_ops btrfs_fs_ops = {
     .getfssec      = btrfs_getfssec,
     .close_file    = generic_close_file,
     .mangle_name   = generic_mangle_name,
-    .unmangle_name = generic_unmangle_name,
     .load_config   = generic_load_config
 };
diff --git a/core/fs/ext2/ext2.c b/core/fs/ext2/ext2.c
index f1853d3..14457af 100644
--- a/core/fs/ext2/ext2.c
+++ b/core/fs/ext2/ext2.c
@@ -328,7 +328,6 @@ const struct fs_ops ext2_fs_ops = {
     .getfssec      = generic_getfssec,
     .close_file    = generic_close_file,
     .mangle_name   = generic_mangle_name,
-    .unmangle_name = generic_unmangle_name,
     .load_config   = generic_load_config,
     .iget_root     = ext2_iget_root,
     .iget          = ext2_iget,
diff --git a/core/fs/fat/fat.c b/core/fs/fat/fat.c
index 3ea253d..685f731 100644
--- a/core/fs/fat/fat.c
+++ b/core/fs/fat/fat.c
@@ -825,7 +825,6 @@ const struct fs_ops vfat_fs_ops = {
     .getfssec      = generic_getfssec,
     .close_file    = generic_close_file,
     .mangle_name   = vfat_mangle_name,
-    .unmangle_name = generic_unmangle_name,
     .load_config   = vfat_load_config,
     .readdir       = vfat_readdir,
     .iget_root     = vfat_iget_root,
diff --git a/core/fs/fs.c b/core/fs/fs.c
index 94ee0c9..9002fa6 100644
--- a/core/fs/fs.c
+++ b/core/fs/fs.c
@@ -88,26 +88,17 @@ void mangle_name(char *dst, const char *src)
     this_fs->fs_ops->mangle_name(dst, src);
 }
 
-/*
- * XXX: current unmangle_name() is stpcpy() on all filesystems; consider
- * eliminating it as a method.
- */
 void pm_unmangle_name(com32sys_t *regs)
 {
     const char *src = MK_PTR(regs->ds, regs->esi.w[0]);
     char       *dst = MK_PTR(regs->es, regs->edi.w[0]);
 
-    dst = unmangle_name(dst, src);
+    dst = stpcpy(dst, src);
 
     /* Update the di register to point to the last null char */
     regs->edi.w[0] = OFFS_WRT(dst, regs->es);
 }
 
-char *unmangle_name(char *dst, const char *src)
-{
-    return this_fs->fs_ops->unmangle_name(dst, src);
-}
-
 void getfssec(com32sys_t *regs)
 {
     int sectors;
diff --git a/core/fs/iso9660/iso9660.c b/core/fs/iso9660/iso9660.c
index 41c27ec..aa1ca16 100644
--- a/core/fs/iso9660/iso9660.c
+++ b/core/fs/iso9660/iso9660.c
@@ -356,7 +356,6 @@ const struct fs_ops iso_fs_ops = {
     .getfssec      = generic_getfssec,
     .close_file    = generic_close_file,
     .mangle_name   = iso_mangle_name,
-    .unmangle_name = generic_unmangle_name,
     .load_config   = iso_load_config,
     .iget_root     = iso_iget_root,
     .iget          = iso_iget,
diff --git a/core/fs/pxe/pxe.c b/core/fs/pxe/pxe.c
index 879dfb6..916571b 100644
--- a/core/fs/pxe/pxe.c
+++ b/core/fs/pxe/pxe.c
@@ -1645,6 +1645,5 @@ const struct fs_ops pxe_fs_ops = {
     .getfssec      = pxe_getfssec,
     .close_file    = pxe_close_file,
     .mangle_name   = pxe_mangle_name,
-    .unmangle_name = stpcpy,
     .load_config   = pxe_load_config,
 };
diff --git a/core/include/fs.h b/core/include/fs.h
index 79499d8..ed196ac 100644
--- a/core/include/fs.h
+++ b/core/include/fs.h
@@ -58,7 +58,6 @@ struct fs_ops {
     uint32_t (*getfssec)(struct file *, char *, int, bool *);
     void     (*close_file)(struct file *);
     void     (*mangle_name)(char *, const char *);
-    char *   (*unmangle_name)(char *, const char *);
     size_t   (*realpath)(struct fs_info *, char *, const char *, size_t);
     int      (*chdir)(struct fs_info *, const char *);
     int      (*load_config)(void);
@@ -219,7 +218,6 @@ int chdir(const char *src);
 
 /* mangle.c */
 void generic_mangle_name(char *, const char *);
-#define generic_unmangle_name stpcpy
 
 /* loadconfig.c */
 int generic_load_config(void);



More information about the Syslinux-commits mailing list