diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2010-11-28 20:03:46 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-11-28 20:03:46 +0000 |
| commit | b6ced2dd9ddab8c31cbe07fe52ee5ac3016d58c9 (patch) | |
| tree | 0959de33d0f24432ea8148453462d71b48ef9413 | |
| parent | 84982ad286b2ad0fdd579bd1586538dcc6c458d5 (diff) | |
| download | openbios-b6ced2dd9ddab8c31cbe07fe52ee5ac3016d58c9.zip openbios-b6ced2dd9ddab8c31cbe07fe52ee5ac3016d58c9.tar.gz openbios-b6ced2dd9ddab8c31cbe07fe52ee5ac3016d58c9.tar.bz2 | |
Rename conflicting hfsplus files
Files in fs/hfs and fs/hfsplus have same names, this causes problems
during linkage.
Use prefix 'hfsp_' for the conflicting files.
Acked-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@978 f158a5a8-5612-0410-a976-696ce0be7e32
| -rw-r--r-- | fs/hfsplus/build.xml | 10 | ||||
| -rw-r--r-- | fs/hfsplus/hfsp_blockiter.c (renamed from fs/hfsplus/blockiter.c) | 0 | ||||
| -rw-r--r-- | fs/hfsplus/hfsp_btree.c (renamed from fs/hfsplus/btree.c) | 2 | ||||
| -rw-r--r-- | fs/hfsplus/hfsp_record.c (renamed from fs/hfsplus/record.c) | 0 | ||||
| -rw-r--r-- | fs/hfsplus/hfsp_unicode.c (renamed from fs/hfsplus/unicode.c) | 0 | ||||
| -rw-r--r-- | fs/hfsplus/hfsp_volume.c (renamed from fs/hfsplus/volume.c) | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/fs/hfsplus/build.xml b/fs/hfsplus/build.xml index d3d32cb..5f4c288 100644 --- a/fs/hfsplus/build.xml +++ b/fs/hfsplus/build.xml @@ -1,11 +1,11 @@ <build> <library name="fs" type="static" target="target"> - <object source="blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_blockiter.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_btree.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="libhfsp.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> - <object source="volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_record.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_unicode.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> + <object source="hfsp_volume.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> <object source="hfsp_fs.c" flags="-I$(SRCDIR)/fs/hfsplus/include -I$(SRCDIR)/fs/ -fno-strict-aliasing" condition="HFSP"/> </library> </build> diff --git a/fs/hfsplus/blockiter.c b/fs/hfsplus/hfsp_blockiter.c index e910092..e910092 100644 --- a/fs/hfsplus/blockiter.c +++ b/fs/hfsplus/hfsp_blockiter.c diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/hfsp_btree.c index 5409418..24eca92 100644 --- a/fs/hfsplus/btree.c +++ b/fs/hfsplus/hfsp_btree.c @@ -287,7 +287,7 @@ void* btree_key_by_index(btree* bt, node_buf* buf, UInt16 index) UInt16 node_size = bt->head.node_size; // The offsets are found at the end of the node ... UInt16 off_pos = node_size - (index +1) * sizeof(btree_record_offset); - // position of offset at end of node + // position of offset at end of node btree_record_offset* offset = (btree_record_offset*) (buf->node + off_pos); diff --git a/fs/hfsplus/record.c b/fs/hfsplus/hfsp_record.c index d4e7af1..d4e7af1 100644 --- a/fs/hfsplus/record.c +++ b/fs/hfsplus/hfsp_record.c diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/hfsp_unicode.c index a798085..a798085 100644 --- a/fs/hfsplus/unicode.c +++ b/fs/hfsplus/hfsp_unicode.c diff --git a/fs/hfsplus/volume.c b/fs/hfsplus/hfsp_volume.c index 40b3eac..802d700 100644 --- a/fs/hfsplus/volume.c +++ b/fs/hfsplus/hfsp_volume.c @@ -180,7 +180,7 @@ volume_read_wrapper(volume * vol, hfsp_vh* vh) UInt32 drAlBlkSiz; /* size (in bytes) of allocation blocks */ UInt32 sect_per_block; /* how may block build an hfs sector */ UInt16 drAlBlSt; /* first allocation block in volume */ - UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ + UInt16 embeds, embedl; /* Start/lenght of embedded area in blocks */ p += 0x12; /* skip unneded HFS vol fields */ drAlBlkSiz = bswabU32_inc(p); /* offset 0x14 */ @@ -303,7 +303,7 @@ volume_probe(int fd, long long offset) if (__be16_to_cpu(vol[0]) == HFS_VOLHEAD_SIG && __be16_to_cpu(vol[0x7c]) == HFSP_VOLHEAD_SIG) { - ret = -1; + ret = -1; } else if (__be16_to_cpu(vol[0]) == HFSP_VOLHEAD_SIG) { ret = -1; } |