Fixing bugs found by static analysis

[tt-rss.git] / lib / phpqrcode / phpqrcode.php

diff --git a/lib/phpqrcode/phpqrcode.php b/lib/phpqrcode/phpqrcode.php
index 80adb9df239cb4cbd05cc51295f5eef5e5bbf8e7..02b8776392394de68a7820c64a6adad35a186a80 100644 (file)
--- a/lib/phpqrcode/phpqrcode.php
+++ b/lib/phpqrcode/phpqrcode.php
@@ -2195,7 +2195,7 @@
                     case QR_MODE_NUM: $length = $this->eatNum(); break;\r
                     case QR_MODE_AN:  $length = $this->eatAn(); break;\r
                     case QR_MODE_KANJI:\r
-                        if ($hint == QR_MODE_KANJI)\r
+                        if ($this->modeHint == QR_MODE_KANJI)\r
                                 $length = $this->eatKanji();\r
                         else    $length = $this->eat8();\r
                         break;\r
@@ -2217,7 +2217,7 @@
             $p = 0;\r
             \r
             while ($p<$stringLen) {\r
-                $mode = self::identifyMode(substr($this->dataStr, $p), $this->modeHint);\r
+                $mode = self::identifyMode(substr($this->dataStr, $p));\r
                 if($mode == QR_MODE_KANJI) {\r
                     $p += 2;\r
                 } else {\r
@@ -2621,13 +2621,13 @@
                 if (file_exists($fileName)) {\r
                     $bitMask = self::unserial(file_get_contents($fileName));\r
                 } else {\r
-                    $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);\r
+                    $bitMask = $this->generateMaskNo($maskNo, $width, $s);\r
                     if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))\r
                         mkdir(QR_CACHE_DIR.'mask_'.$maskNo);\r
                     file_put_contents($fileName, self::serial($bitMask));\r
                 }\r
             } else {\r
-                $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);\r
+                $bitMask = $this->generateMaskNo($maskNo, $width, $s);\r
             }\r
 \r
             if ($maskGenOnly)\r
@@ -2937,7 +2937,7 @@
         //----------------------------------------------------------------------\r
         public function getCode()\r
         {\r
-            $ret;\r
+            $ret = 0;\r
 \r
             if($this->count < $this->dataLength) {\r
                 $row = $this->count % $this->blocks;\r
@@ -3059,7 +3059,7 @@
             $input = new QRinput($version, $level);\r
             if($input == NULL) return NULL;\r
 \r
-            $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));\r
+            $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));\r
             if($ret < 0) {\r
                 unset($input);\r
                 return NULL;\r