Further style and comment adjustments

[libs/core.git] / source / jisx0208.cpp

diff --git a/source/jisx0208.cpp b/source/jisx0208.cpp
index 0dd0d211743c5f3680376e069760189e26c2313c..6b46b1b679b5a94636e807d350510174eb0eb86f 100644 (file)
--- a/source/jisx0208.cpp
+++ b/source/jisx0208.cpp
@@ -16,10 +16,10 @@ namespace Codecs {
 
 void JisX0208::Encoder::encode_char(UnicodeChar ucs, string &buf)
 {
-       unsigned short jis=ucs_to_jisx0208(ucs);
+       unsigned short jis = ucs_to_jisx0208(ucs);
        if(jis)
        {
-               char jbuf[2]={jis>>8, jis};
+               char jbuf[2] = {jis>>8, jis};
                buf.append(jbuf, 2);
        }
        else
@@ -37,22 +37,22 @@ UnicodeChar JisX0208::Decoder::decode_char(const string &str, string::const_iter
        if(i==str.end())
                return error("No input");
 
-       string::const_iterator j=i;
+       string::const_iterator j = i;
        Kuten jis;
-       jis.ku=*j++-0x20;
+       jis.ku = *j++-0x20;
 
        UnicodeChar result;
        if(j==str.end())
-               result=error("Incomplete JIS X 0208 character");
+               result = error("Incomplete JIS X 0208 character");
        else
        {
-               jis.ten=*j++-0x20;
-               result=jisx0208_to_ucs(jis);
+               jis.ten = *j++-0x20;
+               result = jisx0208_to_ucs(jis);
                if(result==0)
-                       result=error("Undefined JIS X 0208 character");
+                       result = error("Undefined JIS X 0208 character");
        }
 
-       i=j;
+       i = j;
        return result;
 }
 
@@ -70,20 +70,20 @@ Kuten ucs_to_jisx0208(UnicodeChar c)
        if(c<0 || c>0xFFFF)
                return Kuten();
 
-       unsigned i=0;
+       unsigned i = 0;
        for(unsigned bit=0x1000; bit; bit>>=1)
        {
                if(i+bit>=ucs_to_jisx0208_table_size)
                        continue;
                if(ucs_to_jisx0208_table[i+bit].ucs<=static_cast<unsigned short>(c))
-                       i+=bit;
+                       i += bit;
        }
 
        Kuten result;
        if(ucs_to_jisx0208_table[i].ucs==static_cast<unsigned short>(c))
        {
-               result.ku=(ucs_to_jisx0208_table[i].jis>>8)+1;
-               result.ten=ucs_to_jisx0208_table[i].jis+1;
+               result.ku = (ucs_to_jisx0208_table[i].jis>>8)+1;
+               result.ten = ucs_to_jisx0208_table[i].jis+1;
        }
 
        return result;