From be55a64665ef8ff33490a5afc186e7cd9a4e1295 Mon Sep 17 00:00:00 2001 From: blueswirl Date: Sun, 28 Nov 2010 20:03:46 +0000 Subject: [PATCH] Rename conflicting hfsplus files MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Blue Swirl git-svn-id: svn://openbios.org/openbios/trunk/openbios-devel@978 f158a5a8-5612-0410-a976-696ce0be7e32 --- fs/hfsplus/build.xml | 22 +++++++++++----------- fs/hfsplus/{blockiter.c => hfsp_blockiter.c} | 0 fs/hfsplus/{btree.c => hfsp_btree.c} | 2 +- fs/hfsplus/{record.c => hfsp_record.c} | 0 fs/hfsplus/{unicode.c => hfsp_unicode.c} | 0 fs/hfsplus/{volume.c => hfsp_volume.c} | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) rewrite fs/hfsplus/build.xml (65%) rename fs/hfsplus/{blockiter.c => hfsp_blockiter.c} (100%) rename fs/hfsplus/{btree.c => hfsp_btree.c} (99%) rename fs/hfsplus/{record.c => hfsp_record.c} (100%) rename fs/hfsplus/{unicode.c => hfsp_unicode.c} (100%) rename fs/hfsplus/{volume.c => hfsp_volume.c} (98%) diff --git a/fs/hfsplus/build.xml b/fs/hfsplus/build.xml dissimilarity index 65% index d3d32cb..5f4c288 100644 --- a/fs/hfsplus/build.xml +++ b/fs/hfsplus/build.xml @@ -1,11 +1,11 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/fs/hfsplus/blockiter.c b/fs/hfsplus/hfsp_blockiter.c similarity index 100% rename from fs/hfsplus/blockiter.c rename to fs/hfsplus/hfsp_blockiter.c diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/hfsp_btree.c similarity index 99% rename from fs/hfsplus/btree.c rename to 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 similarity index 100% rename from fs/hfsplus/record.c rename to fs/hfsplus/hfsp_record.c diff --git a/fs/hfsplus/unicode.c b/fs/hfsplus/hfsp_unicode.c similarity index 100% rename from fs/hfsplus/unicode.c rename to fs/hfsplus/hfsp_unicode.c diff --git a/fs/hfsplus/volume.c b/fs/hfsplus/hfsp_volume.c similarity index 98% rename from fs/hfsplus/volume.c rename to 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; } -- 2.11.4.GIT