1 files changed, 12 insertions, 12 deletions

diff --git a/noncore/apps/opie-reader/CEncoding.cpp b/noncore/apps/opie-reader/CEncoding.cpp
index c1dcfe8..60a1057 100644
--- a/noncore/apps/opie-reader/CEncoding.cpp
+++ b/noncore/apps/opie-reader/CEncoding.cpp
@@ -1,26 +1,26 @@
 #include <stdio.h>
 #include "CEncoding.h"
 
 void CUtf8::getch(tchar& ch, CStyle& sty)
 {
-    int iret;
-    parent->getch(iret, sty);
-    if (iret == EOF)
+    tchar ret;
+    parent->getch(ret, sty);
+    if (ret == UEOF)
     {
         ch = UEOF;
         return;
     }
-    tchar ret = iret;
     int count = 0;
     if (ret & (1 << 7))
     {
         unsigned char flags = ret << 1;
         while ((flags & (1 << 7)) != 0)
         {
             ret <<= 6;
+            tchar iret;
             parent->getch(iret, sty);
             ret += iret & 0x3f;
             flags <<= 1;
             count++;
         }
         switch (count)
@@ -42,46 +42,46 @@ void CUtf8::getch(tchar& ch, CStyle& sty)
     ch = ret;
     return;
 }
 
 void CUcs16be::getch(tchar& ch, CStyle& sty)
 {
-    int iret;
+    tchar iret;
     parent->getch(iret, sty);
-    if (iret == EOF)
+    if (iret == UEOF)
     {
         ch = UEOF;
         return;
     }
     tchar ret = iret;
     parent->getch(iret, sty);
     ch = (ret << 8) + iret;
 }
 
 void CUcs16le::getch(tchar& ch, CStyle& sty)
 {
-    int iret;
+    tchar iret;
     parent->getch(iret, sty);
-    if (iret == EOF)
+    if (iret == UEOF)
     {
         ch = UEOF;
         return;
     }
     tchar ret = iret;
     parent->getch(iret, sty);
     ch = ret + (iret << 8);
 }
 
 void Ccp1252::getch(tchar& ch, CStyle& sty)
 {
-    int iret;
+    tchar iret;
     parent->getch(iret, sty);
     ch = iret;
     switch (ch)
     {
-        case EOF:
+        case UEOF:
             ch = UEOF;
             break;
         case 0x80:
             ch = 0x20ac;
             break;
         case 0x82:
@@ -194,15 +194,15 @@ void CPalm::getch(tchar& ch, CStyle& sty)
             break;
     }
 }
 
 void CAscii::getch(tchar& ch, CStyle& sty)
 {
-    int iret;
+    tchar iret;
     parent->getch(iret, sty);
-    if (iret == EOF)
+    if (iret == UEOF)
     {
         ch = UEOF;
     }
     else
     {
         ch = iret;