hfsprogs: update to 540.1.linux3

[feed/packages.git] / utils / hfsprogs / patches / 0006-Adjust-types-for-printing.patch

diff --git a/utils/hfsprogs/patches/0006-Adjust-types-for-printing.patch b/utils/hfsprogs/patches/0006-Adjust-types-for-printing.patch
deleted file mode 100644 (file)
index d4bb88b..0000000
--- a/utils/hfsprogs/patches/0006-Adjust-types-for-printing.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito@ime.usp.br>
-Date: Thu, 24 Oct 2013 01:11:21 -0200
-Subject: Adjust types for printing
-
-Try to address the issues of a given integral type having different sizes
-in 32 and 64-bit architectures.
----
- fsck_hfs.tproj/dfalib/SControl.c   | 2 +-
- fsck_hfs.tproj/dfalib/hfs_endian.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/fsck_hfs.tproj/dfalib/SControl.c
-+++ b/fsck_hfs.tproj/dfalib/SControl.c
-@@ -776,7 +776,7 @@ static int ScavSetUp( SGlob *GPtr)
-               pointer = (ScavStaticStructures *) AllocateClearMemory( sizeof(ScavStaticStructures) );
-               if ( pointer == nil ) {
-                       if ( GPtr->logLevel >= kDebugLog ) {
--                              printf( "\t error %d - could not allocate %ld bytes of memory \n",
-+                              printf( "\t error %d - could not allocate %i bytes of memory \n",
-                                       R_NoMem, sizeof(ScavStaticStructures) );
-                       }
-                       return( R_NoMem );
---- a/fsck_hfs.tproj/dfalib/hfs_endian.c
-+++ b/fsck_hfs.tproj/dfalib/hfs_endian.c
-@@ -563,7 +563,7 @@ hfs_swap_HFSPlusBTInternalNode (
-             /* Make sure name length is consistent with key length */
-             if (keyLength < sizeof(srcKey->parentID) + sizeof(srcKey->nodeName.length) +
-                 srcKey->nodeName.length*sizeof(srcKey->nodeName.unicode[0])) {
--                              if (debug) printf("hfs_swap_HFSPlusBTInternalNode: catalog record #%d keyLength=%d expected=%lu\n",
-+                              if (debug) printf("hfs_swap_HFSPlusBTInternalNode: catalog record #%d keyLength=%d expected=%i\n",
-                                       srcDesc->numRecords-i, keyLength, sizeof(srcKey->parentID) + sizeof(srcKey->nodeName.length) +
-                     srcKey->nodeName.length*sizeof(srcKey->nodeName.unicode[0]));
-                               WriteError(fcb->fcbVolume->vcbGPtr, E_KeyLen, fcb->fcbFileID, src->blockNum);