[OpenBIOS] [commit] r978 - trunk/openbios-devel/fs/hfsplus

repository service svn at openbios.org
Sun Nov 28 21:03:47 CET 2010


Author: blueswirl
Date: Sun Nov 28 21:03:46 2010
New Revision: 978
URL: http://tracker.coreboot.org/trac/openbios/changeset/978

Log:
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 at web.de>
Signed-off-by: Blue Swirl <blauwirbel at gmail.com>

Added:
   trunk/openbios-devel/fs/hfsplus/hfsp_blockiter.c
      - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/blockiter.c
   trunk/openbios-devel/fs/hfsplus/hfsp_btree.c
      - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/btree.c
   trunk/openbios-devel/fs/hfsplus/hfsp_record.c
      - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/record.c
   trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c
      - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/unicode.c
   trunk/openbios-devel/fs/hfsplus/hfsp_volume.c
      - copied, changed from r977, trunk/openbios-devel/fs/hfsplus/volume.c
Deleted:
   trunk/openbios-devel/fs/hfsplus/blockiter.c
   trunk/openbios-devel/fs/hfsplus/btree.c
   trunk/openbios-devel/fs/hfsplus/record.c
   trunk/openbios-devel/fs/hfsplus/unicode.c
   trunk/openbios-devel/fs/hfsplus/volume.c
Modified:
   trunk/openbios-devel/fs/hfsplus/build.xml

Modified: trunk/openbios-devel/fs/hfsplus/build.xml
==============================================================================
--- trunk/openbios-devel/fs/hfsplus/build.xml	Sun Nov 28 14:13:38 2010	(r977)
+++ trunk/openbios-devel/fs/hfsplus/build.xml	Sun Nov 28 21:03:46 2010	(r978)
@@ -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>

Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_blockiter.c (from r977, trunk/openbios-devel/fs/hfsplus/blockiter.c)
==============================================================================

Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_btree.c (from r977, trunk/openbios-devel/fs/hfsplus/btree.c)
==============================================================================
--- trunk/openbios-devel/fs/hfsplus/btree.c	Sun Nov 28 14:13:38 2010	(r977, copy source)
+++ trunk/openbios-devel/fs/hfsplus/hfsp_btree.c	Sun Nov 28 21:03:46 2010	(r978)
@@ -287,7 +287,7 @@
     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);
 

Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_record.c (from r977, trunk/openbios-devel/fs/hfsplus/record.c)
==============================================================================

Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_unicode.c (from r977, trunk/openbios-devel/fs/hfsplus/unicode.c)
==============================================================================

Copied and modified: trunk/openbios-devel/fs/hfsplus/hfsp_volume.c (from r977, trunk/openbios-devel/fs/hfsplus/volume.c)
==============================================================================
--- trunk/openbios-devel/fs/hfsplus/volume.c	Sun Nov 28 14:13:38 2010	(r977, copy source)
+++ trunk/openbios-devel/fs/hfsplus/hfsp_volume.c	Sun Nov 28 21:03:46 2010	(r978)
@@ -180,7 +180,7 @@
 		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 @@
 
 	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;
 	}



More information about the OpenBIOS mailing list