* Fix build of r_fs in OSX

This commit is contained in:
pancake 2011-02-21 18:33:52 +01:00
parent 7ba206b3f8
commit a6f49396a6
20 changed files with 5 additions and 252 deletions

2
TODO
View File

@ -5,6 +5,8 @@
Random stuff
-----------
* missing filesystems:
- ntfscomp, minix, nilfs2, sfs, gb, afs, affs, zfs, ...
* For each "call" or "push offset"+"ret" create a function.
- And, if deep code analysis is enabled:
- Search every possible function by searching typical prologs and put them in a queue.

View File

@ -559,7 +559,7 @@ grub_affs_label (grub_device_t device, char **label)
}
static struct grub_fs grub_affs_fs =
struct grub_fs grub_affs_fs =
{
.name = "affs",
.dir = grub_affs_dir,
@ -569,14 +569,3 @@ static struct grub_fs grub_affs_fs =
.label = grub_affs_label,
.next = 0
};
GRUB_MOD_INIT(affs)
{
grub_fs_register (&grub_affs_fs);
my_mod = mod;
}
GRUB_MOD_FINI(affs)
{
grub_fs_unregister (&grub_affs_fs);
}

View File

@ -700,30 +700,3 @@ static struct grub_fs grub_afs_fs = {
.label = grub_afs_label,
.next = 0
};
#if defined (MODE_BIGENDIAN) && defined (MODE_BFS)
GRUB_MOD_INIT (befs_be)
#elif defined (MODE_BFS)
GRUB_MOD_INIT (befs)
#elif defined (MODE_BIGENDIAN)
GRUB_MOD_INIT (afs_be)
#else
GRUB_MOD_INIT (afs)
#endif
{
grub_fs_register (&grub_afs_fs);
my_mod = mod;
}
#if defined (MODE_BIGENDIAN) && defined (MODE_BFS)
GRUB_MOD_FINI (befs_be)
#elif defined (MODE_BFS)
GRUB_MOD_FINI (befs)
#elif defined (MODE_BIGENDIAN)
GRUB_MOD_FINI (afs_be)
#else
GRUB_MOD_FINI (afs)
#endif
{
grub_fs_unregister (&grub_afs_fs);
}

View File

@ -120,13 +120,3 @@ struct grub_fs grub_btrfs_fs =
.open = grub_btrfs_open,
.uuid = grub_btrfs_uuid,
};
GRUB_MOD_INIT(btrfs)
{
grub_fs_register (&grub_btrfs_fs);
}
GRUB_MOD_FINI(btrfs)
{
grub_fs_unregister (&grub_btrfs_fs);
}

View File

@ -381,29 +381,3 @@ struct grub_fs grub_tar_fs = {
.close = grub_cpio_close,
};
#endif
#ifdef MODE_USTAR
GRUB_MOD_INIT (tar)
{
grub_fs_register (&grub_tar_fs);
my_mod = mod;
}
#else
GRUB_MOD_INIT (cpio)
{
grub_fs_register (&grub_cpio_fs);
my_mod = mod;
}
#endif
#ifdef MODE_USTAR
GRUB_MOD_FINI (tar)
{
grub_fs_unregister (&grub_tar_fs);
}
#else
GRUB_MOD_FINI (cpio)
{
grub_fs_unregister (&grub_cpio_fs);
}
#endif

View File

@ -964,14 +964,3 @@ struct grub_fs grub_ext2_fs =
#endif
.next = 0
};
GRUB_MOD_INIT(ext2)
{
grub_fs_register (&grub_ext2_fs);
my_mod = mod;
}
GRUB_MOD_FINI(ext2)
{
grub_fs_unregister (&grub_ext2_fs);
}

View File

@ -893,15 +893,3 @@ struct grub_fs grub_fat_fs =
#endif
.next = 0
};
GRUB_MOD_INIT(fat)
{
grub_fs_register (&grub_fat_fs);
my_mod = mod;
}
GRUB_MOD_FINI(fat)
{
grub_fs_unregister (&grub_fat_fs);
}

View File

@ -1159,14 +1159,3 @@ struct grub_fs grub_hfs_fs =
.uuid = grub_hfs_uuid,
.next = 0
};
GRUB_MOD_INIT(hfs)
{
grub_fs_register (&grub_hfs_fs);
my_mod = mod;
}
GRUB_MOD_FINI(hfs)
{
grub_fs_unregister (&grub_hfs_fs);
}

View File

@ -1055,14 +1055,3 @@ struct grub_fs grub_hfsplus_fs =
#endif
.next = 0
};
GRUB_MOD_INIT(hfsplus)
{
grub_fs_register (&grub_hfsplus_fs);
my_mod = mod;
}
GRUB_MOD_FINI(hfsplus)
{
grub_fs_unregister (&grub_hfsplus_fs);
}

View File

@ -923,14 +923,3 @@ struct grub_fs grub_iso9660_fs =
.uuid = grub_iso9660_uuid,
.next = 0
};
GRUB_MOD_INIT(iso9660)
{
grub_fs_register (&grub_iso9660_fs);
my_mod = mod;
}
GRUB_MOD_FINI(iso9660)
{
grub_fs_unregister (&grub_iso9660_fs);
}

View File

@ -903,14 +903,3 @@ struct grub_fs grub_jfs_fs =
.uuid = grub_jfs_uuid,
.next = 0
};
GRUB_MOD_INIT(jfs)
{
grub_fs_register (&grub_jfs_fs);
my_mod = mod;
}
GRUB_MOD_FINI(jfs)
{
grub_fs_unregister (&grub_jfs_fs);
}

View File

@ -597,7 +597,7 @@ grub_minix_label (grub_device_t device __attribute ((unused)),
}
static struct grub_fs grub_minix_fs =
struct grub_fs grub_minix_fs =
{
.name = "minix",
.dir = grub_minix_dir,
@ -607,14 +607,3 @@ static struct grub_fs grub_minix_fs =
.label = grub_minix_label,
.next = 0
};
GRUB_MOD_INIT(minix)
{
grub_fs_register (&grub_minix_fs);
my_mod = mod;
}
GRUB_MOD_FINI(minix)
{
grub_fs_unregister (&grub_minix_fs);
}

View File

@ -1122,8 +1122,7 @@ grub_nilfs2_mtime (grub_device_t device, grub_int32_t * tm)
}
static struct grub_fs grub_nilfs2_fs = {
struct grub_fs grub_nilfs2_fs = {
.name = "nilfs2",
.dir = grub_nilfs2_dir,
.open = grub_nilfs2_open,
@ -1137,14 +1136,3 @@ static struct grub_fs grub_nilfs2_fs = {
#endif
.next = 0
};
GRUB_MOD_INIT (nilfs2)
{
grub_fs_register (&grub_nilfs2_fs);
my_mod = mod;
}
GRUB_MOD_FINI (nilfs2)
{
grub_fs_unregister (&grub_nilfs2_fs);
}

View File

@ -1154,14 +1154,3 @@ struct grub_fs grub_ntfs_fs =
#endif
.next = 0
};
GRUB_MOD_INIT (ntfs)
{
grub_fs_register (&grub_ntfs_fs);
my_mod = mod;
}
GRUB_MOD_FINI (ntfs)
{
grub_fs_unregister (&grub_ntfs_fs);
}

View File

@ -362,13 +362,3 @@ quit:
grub_free (ctx->comp.cbuf);
return ret;
}
GRUB_MOD_INIT (ntfscomp)
{
grub_ntfscomp_func = ntfscomp;
}
GRUB_MOD_FINI (ntfscomp)
{
grub_ntfscomp_func = NULL;
}

View File

@ -1383,14 +1383,3 @@ struct grub_fs grub_reiserfs_fs =
.uuid = grub_reiserfs_uuid,
.next = 0
};
GRUB_MOD_INIT(reiserfs)
{
grub_fs_register (&grub_reiserfs_fs);
my_mod = mod;
}
GRUB_MOD_FINI(reiserfs)
{
grub_fs_unregister (&grub_reiserfs_fs);
}

View File

@ -602,14 +602,3 @@ static struct grub_fs grub_sfs_fs =
.label = grub_sfs_label,
.next = 0
};
GRUB_MOD_INIT(sfs)
{
grub_fs_register (&grub_sfs_fs);
my_mod = mod;
}
GRUB_MOD_FINI(sfs)
{
grub_fs_unregister (&grub_sfs_fs);
}

View File

@ -941,14 +941,3 @@ struct grub_fs grub_udf_fs = {
.label = grub_udf_label,
.next = 0
};
GRUB_MOD_INIT (udf)
{
grub_fs_register (&grub_udf_fs);
my_mod = mod;
}
GRUB_MOD_FINI (udf)
{
grub_fs_unregister (&grub_udf_fs);
}

View File

@ -826,23 +826,3 @@ struct grub_fs grub_ufs_fs =
.mtime = grub_ufs_mtime,
.next = 0
};
#ifdef MODE_UFS2
GRUB_MOD_INIT(ufs2)
#else
GRUB_MOD_INIT(ufs1)
#endif
{
grub_fs_register (&grub_ufs_fs);
my_mod = mod;
}
#ifdef MODE_UFS2
GRUB_MOD_FINI(ufs2)
#else
GRUB_MOD_FINI(ufs1)
#endif
{
grub_fs_unregister (&grub_ufs_fs);
}

View File

@ -839,14 +839,3 @@ struct grub_fs grub_xfs_fs =
.uuid = grub_xfs_uuid,
.next = 0
};
GRUB_MOD_INIT(xfs)
{
grub_fs_register (&grub_xfs_fs);
my_mod = mod;
}
GRUB_MOD_FINI(xfs)
{
grub_fs_unregister (&grub_xfs_fs);
}