danog/PHPStruct
1
0
Fork 0
mirror of https://github.com/danog/PHPStruct.git synced 2024-12-02 09:17:53 +01:00
Code Issues Projects Releases Wiki Activity

Simplify packing

Browse Source
This commit is contained in:
Daniil Gentili 2018-06-03 13:23:37 +02:00
parent 794445b60c
commit 41ccdd98cf
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/danog/PHP/StructTools.php
View File

@ -793,7 +793,7 @@ class StructTools
/** /**
* num_pack. * num_pack.
* *
* Convert a number to a byte string. * Convert a number to a big endian byte string.
* If optional blocksize is given and greater than zero, pad the front of the * If optional blocksize is given and greater than zero, pad the front of the
* byte string with binary zeros so that the length is the * byte string with binary zeros so that the length is the
* blocksize. * blocksize.
@ -855,26 +855,11 @@ class StructTools
} }
$bits = $this->decbin($n, $bitnumber); $bits = $this->decbin($n, $bitnumber);
$s = null; $s = null;
foreach (explode('2', wordwrap($bits, 8, '2', true)) as $byte) { foreach (str_split($bits, 8) as $byte) {
$s .= chr($this->bindec($byte)); $s .= chr($this->bindec($byte));
} }
$break = true;
$l = strlen($s); if (strlen($s) > $blocksize) {
for ($i = 0; $i < $l; $i++) {
if ($s[$i] != pack('@')[0]) {
$break = false;
break;
}
}
if ($break) {
$s = pack('@1');
$i = 0;
}
$s = substr($s, $i);
if (strlen($s) < $blocksize) {
$s = pack('@'.($blocksize - strlen($s))).$s;
} elseif (strlen($s) > $blocksize) {
trigger_error('Generated data length ('.strlen($s).') is bigger than required length ('.$blocksize.').'); trigger_error('Generated data length ('.strlen($s).') is bigger than required length ('.$blocksize.').');
} }