transactd 1.2.0 → 2.0.0

data/source/bzs/db/protocol/tdap/mysql/characterset.cpp

@@ -12,8 +12,8 @@
    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., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "characterset.h"
@@ -36,57 +36,54 @@ namespace mysql
 
 struct SCHARSET_INFO
 {
-	unsigned short codePage;
-	char	name[12];
-	char	charSize;
-
+    unsigned short codePage;
+    char name[12];
+    char charSize;
 };
 
-
 SCHARSET_INFO
-charsetInfo[MAX_CHAR_INFO] =
-{
-{1252,"acp",1},         //0
-{1252,"latin1",1},      //1
-{950,"big5",2},  		//2
-{850,"dec8",1},         //3
-{850,"cp850",1},        //4
-{0,"hp8",1},            //5
-{20866,"koi8r",1},      //6
-{28592,"latin2",1},     //7
-{20107,"swe7",1},       //8
-{1252,"ascii",1},       //9
-{50220,"ujis",3},       //10
-{932,"sjis",2},         //11
-{1255,"hebrew",1},      //12
-{0,"tis620",1},         //13
-{949,"euckr",2},        //14
-{20866,"koi8u",1},      //15
-{936,"gb2312",2},       //16
-{1253,"greek",1},       //17
-{1250,"cp1250",1},      //18
-{0,"gbk",2},            //19
-{0,"latin5",1},         //20
-{0,"armscii8",1},       //21
-{65001,"utf8",3},       //22
-{1200,"ucs2",2},        //23
-{866,"cp866",1},        //24
-{0,"keybcs2",1},        //25
-{0,"macce",1},          //26
-{0,"macroman",1},       //27
-{852,"cp852",1},        //28
-{0,"latin7",1},         //29
-{65001,"utf8mb4",4},    //30
-{1251,"cp1251",1},      //31
-{1201,"utf16",4},       //32
-{1200,"utf16le",4},     //33 //5.6.1 or upper
-{1256,"cp1256",1},      //34
-{1257,"cp1257",1},      //35
-{12000,"utf32",4},      //36
-{0,"binary",1},         //37
-{932,"cp932",2},        //38
-{0,"geostd8",1},        //39
-{51932,"eucjpms",3}     //40
+charsetInfo[MAX_CHAR_INFO] = {
+    { 1252, "acp", 1 }, // 0
+    { 1252, "latin1", 1 }, // 1
+    { 950, "big5", 2 }, // 2
+    { 850, "dec8", 1 }, // 3
+    { 850, "cp850", 1 }, // 4
+    { 0, "hp8", 1 }, // 5
+    { 20866, "koi8r", 1 }, // 6
+    { 28592, "latin2", 1 }, // 7
+    { 20107, "swe7", 1 }, // 8
+    { 1252, "ascii", 1 }, // 9
+    { 50220, "ujis", 3 }, // 10
+    { 932, "sjis", 2 }, // 11
+    { 1255, "hebrew", 1 }, // 12
+    { 0, "tis620", 1 }, // 13
+    { 949, "euckr", 2 }, // 14
+    { 20866, "koi8u", 1 }, // 15
+    { 936, "gb2312", 2 }, // 16
+    { 1253, "greek", 1 }, // 17
+    { 1250, "cp1250", 1 }, // 18
+    { 0, "gbk", 2 }, // 19
+    { 0, "latin5", 1 }, // 20
+    { 0, "armscii8", 1 }, // 21
+    { 65001, "utf8", 3 }, // 22
+    { 1200, "ucs2", 2 }, // 23
+    { 866, "cp866", 1 }, // 24
+    { 0, "keybcs2", 1 }, // 25
+    { 0, "macce", 1 }, // 26
+    { 0, "macroman", 1 }, // 27
+    { 852, "cp852", 1 }, // 28
+    { 0, "latin7", 1 }, // 29
+    { 65001, "utf8mb4", 4 }, // 30
+    { 1251, "cp1251", 1 }, // 31
+    { 1201, "utf16", 4 }, // 32
+    { 1200, "utf16le", 4 }, // 33 //5.6.1 or upper
+    { 1256, "cp1256", 1 }, // 34
+    { 1257, "cp1257", 1 }, // 35
+    { 12000, "utf32", 4 }, // 36
+    { 0, "binary", 1 }, // 37
+    { 932, "cp932", 2 }, // 38
+    { 0, "geostd8", 1 }, // 39
+    { 51932, "eucjpms", 3 } // 40
 };
 /* 5.5.28
 +----------+----------------+---------------------+--------+
@@ -136,49 +133,49 @@ charsetInfo[MAX_CHAR_INFO] =
 
 unsigned int charsize(int index)
 {
-	if (index < MAX_CHAR_INFO)
-		return charsetInfo[index].charSize;
-	return 1;
+    if (index < MAX_CHAR_INFO)
+        return charsetInfo[index].charSize;
+    return 1;
 }
 
 const char* charsetName(int index)
 {
-	if ((index > 0) && index < MAX_CHAR_INFO)
-		return charsetInfo[index].name;
-	assert(0);
-	return "";
+    if ((index > 0) && index < MAX_CHAR_INFO)
+        return charsetInfo[index].name;
+    assert(0);
+    return "";
 }
 
 unsigned int charsetIndex(const char* name)
 {
-	for (int i=1;i<MAX_CHAR_INFO;++i)
-	{
-		if (strcmp(charsetInfo[i].name, name)==0)
-			return i;
-	}
-	return -1;
+    for (int i = 1; i < MAX_CHAR_INFO; ++i)
+    {
+        if (strcmp(charsetInfo[i].name, name) == 0)
+            return i;
+    }
+    return -1;
 }
 
 unsigned int charsetIndex(unsigned short codePage)
 {
-	for (int i=1;i<MAX_CHAR_INFO;++i)
-	{
-		if (charsetInfo[i].codePage == codePage)
-			return i;
-	}
-	return -1;
+    for (int i = 1; i < MAX_CHAR_INFO; ++i)
+    {
+        if (charsetInfo[i].codePage == codePage)
+            return i;
+    }
+    return -1;
 }
 
 unsigned int codePage(unsigned short charsetIndex)
 {
-	if ((charsetIndex > 0) && charsetIndex < MAX_CHAR_INFO)
-		return charsetInfo[charsetIndex].codePage;
-	assert(0);
-	return 0;
+    if ((charsetIndex > 0) && charsetIndex < MAX_CHAR_INFO)
+        return charsetInfo[charsetIndex].codePage;
+    assert(0);
+    return 0;
 }
 
-}//namespace mysql
-}//namespace tdap
-}//namespace protocol
-}//namespace db
-}//namespace bzs
+} // namespace mysql
+} // namespace tdap
+} // namespace protocol
+} // namespace db
+} // namespace bzs

data/source/bzs/db/protocol/tdap/mysql/characterset.h

@@ -21,19 +21,17 @@
 
 #include <bzs/env/compiler.h>
 
-
-
-#define MAX_CHAR_INFO   41
-#define CHARSET_LATIN1   1
-#define CHARSET_CP850    4
-#define CHARSET_ASCII    9
-#define CHARSET_SJIS	11
-#define CHARSET_UTF8	22
-#define CHARSET_USC2	23
-#define CHARSET_UTF8B4	30
-#define CHARSET_UTF16LE	33
-#define CHARSET_CP932	38
-#define CHARSET_EUCJ	40
+#define MAX_CHAR_INFO 41
+#define CHARSET_LATIN1 1
+#define CHARSET_CP850 4
+#define CHARSET_ASCII 9
+#define CHARSET_SJIS 11
+#define CHARSET_UTF8 22
+#define CHARSET_USC2 23
+#define CHARSET_UTF8B4 30
+#define CHARSET_UTF16LE 33
+#define CHARSET_CP932 38
+#define CHARSET_EUCJ 40
 
 namespace bzs
 {
@@ -52,9 +50,10 @@ PACKAGE unsigned int charsetIndex(const char* name);
 PACKAGE unsigned int charsetIndex(unsigned short codePage);
 PACKAGE unsigned int codePage(unsigned short charsetIndex);
 
-}//namespace mysql
-}//namespace tdap
-}//namespace protocol
-}//namespace db
-}//namespace bzs
-#endif //BZS_DB_PROTOCOL_TDAP_MYSQL_CHARACTERSET_H
+} // namespace mysql
+} // namespace tdap
+} // namespace protocol
+} // namespace db
+} // namespace bzs
+
+#endif // BZS_DB_PROTOCOL_TDAP_MYSQL_CHARACTERSET_H