diff --git a/class-MoReaderException.php b/class-MoReaderException.php deleted file mode 100644 index 379cea4..0000000 --- a/class-MoReaderException.php +++ /dev/null @@ -1,28 +0,0 @@ -. - Copyright (c) 2016 Michal Čihař - - This file is part of MoTranslator. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -/** - * Exception thrown when file can not be read. - */ -class MoReaderException extends Exception -{ -} diff --git a/class-MoStringReader.php b/class-MoStringReader.php index ab2850c..9124e67 100644 --- a/class-MoStringReader.php +++ b/class-MoStringReader.php @@ -1,90 +1,90 @@ . Copyright (c) 2016 Michal Čihař This file is part of MoTranslator. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ /** * Simple wrapper around string buffer for * random access and values parsing. */ class MoStringReader { private $str; private $len; /** * Constructor. * * @param string $filename Name of file to load */ public function __construct( $filename ) { $this->str = file_get_contents( $filename ); $this->len = strlen( $this->str ); } /** * Read number of bytes from given offset. * * @param int $pos Offset * @param int $bytes Number of bytes to read * * @return string */ public function read( $pos, $bytes ) { if( $pos + $bytes > $this->len ) { - throw new MoReaderException( 'not enough bytes' ); + throw new Exception( 'not enough bytes' ); } return substr( $this->str, $pos, $bytes ); } /** * Reads a 32bit integer from the stream. * * @param string $unpack Unpack string * @param int $pos Position * * @return int Ingerer from the stream */ public function readint( $unpack, $pos ) { $data = unpack( $unpack, $this->read($pos, 4) ); $result = $data[1]; /* We're reading unsigned int, but PHP will happily * give us negative number on 32-bit platforms. * * See also documentation: * https://secure.php.net/manual/en/function.unpack.php#refsect1-function.unpack-notes */ return $result < 0 ? PHP_INT_MAX : $result; } /** * Reads an array of integers from the stream. * * @param string $unpack Unpack string * @param int $pos Position * @param int $count How many elements should be read * * @return array Array of Integers */ public function readintarray( $unpack, $pos, $count ) { return unpack( $unpack . $count, $this->read( $pos, 4 * $count ) ); } }