Continued:

[core.git] / framework / main / classes / stacker / file / class_BaseFileStack.php

diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php
index abb9c5e7e93ae4db347dd6a13128f69c93fb5d52..f904afb5d69772faf05bfc832e37e363884993c9 100644 (file)
--- a/framework/main/classes/stacker/file/class_BaseFileStack.php
+++ b/framework/main/classes/stacker/file/class_BaseFileStack.php
@@ -101,12 +101,12 @@ abstract class BaseFileStack extends BaseStacker {
                }
 
                // Last character must be the separator
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: data(-1)=%s', dechex(ord(substr($data, -1, 1)))));
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: data(-1)=0x%s', dechex(ord(substr($data, -1, 1)))));
                if (substr($data, -1, 1) !== chr(BinaryFile::SEPARATOR_HEADER_ENTRIES)) {
                        // Not valid separator
-                       throw new UnexpectedValueException(sprintf('data=%s does not have separator=%s at the end.',
+                       throw new UnexpectedValueException(sprintf('data=%s does not have separator=0x%s at the end.',
                                $data,
-                               BinaryFile::SEPARATOR_HEADER_ENTRIES
+                               dechex(BinaryFile::SEPARATOR_HEADER_ENTRIES)
                        ));
                }
 
@@ -127,7 +127,7 @@ abstract class BaseFileStack extends BaseStacker {
                $header = explode(chr(BinaryFile::SEPARATOR_HEADER_DATA), $data);
 
                // Map numeric indexes to associative indexes
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: header()=%d', count($header)));
+               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('BASE-FILE-STACK: Calling ArrayUtils::mapNumericKeysToAssociative(%d) ...', count($header)));
                $header = ArrayUtils::mapNumericKeysToAssociative($header, [
                        BinaryFile::HEADER_NAME_MAGIC,
                        BinaryFile::HEADER_NAME_TOTAL_ENTRIES,