Fix style issues

This commit is contained in:
Denis Kenzior 2009-09-08 09:42:29 -05:00
parent dab84882af
commit bfbe142774
1 changed files with 18 additions and 36 deletions

View File

@ -80,8 +80,7 @@ struct single_shift_table {
}; };
/* GSM to Unicode extension table, for GSM sequences starting with 0x1B */ /* GSM to Unicode extension table, for GSM sequences starting with 0x1B */
static const struct codepoint default_ext_gsm[] = static const struct codepoint default_ext_gsm[] = {
{
{ 0x0A, 0x000C }, /* See NOTE 3 in 23.038 */ { 0x0A, 0x000C }, /* See NOTE 3 in 23.038 */
{ 0x14, 0x005E }, { 0x14, 0x005E },
{ 0x1B, 0x0020 }, /* See NOTE 1 in 23.038 */ { 0x1B, 0x0020 }, /* See NOTE 1 in 23.038 */
@ -95,8 +94,7 @@ static const struct codepoint default_ext_gsm[] =
{ 0x65, 0x20AC } { 0x65, 0x20AC }
}; };
static const struct codepoint default_ext_unicode[] = static const struct codepoint default_ext_unicode[] = {
{
{ 0x000C, 0x1B0A }, { 0x000C, 0x1B0A },
{ 0x005B, 0x1B3C }, { 0x005B, 0x1B3C },
{ 0x005C, 0x1B2F }, { 0x005C, 0x1B2F },
@ -110,8 +108,7 @@ static const struct codepoint default_ext_unicode[] =
}; };
/* Appendix A.2.1. in 3GPP TS23.038, V.8.2.0 */ /* Appendix A.2.1. in 3GPP TS23.038, V.8.2.0 */
static const struct codepoint turkish_ext_gsm[] = static const struct codepoint turkish_ext_gsm[] = {
{
{ 0x0A, 0x000C }, /* See NOTE 3 */ { 0x0A, 0x000C }, /* See NOTE 3 */
{ 0x14, 0x005E }, { 0x14, 0x005E },
{ 0x1B, 0x0020 }, /* See NOTE 1 */ { 0x1B, 0x0020 }, /* See NOTE 1 */
@ -132,8 +129,7 @@ static const struct codepoint turkish_ext_gsm[] =
{ 0x73, 0x015F } { 0x73, 0x015F }
}; };
static const struct codepoint turkish_ext_unicode[] = static const struct codepoint turkish_ext_unicode[] = {
{
{ 0x000C, 0x1B0A }, { 0x000C, 0x1B0A },
{ 0x005B, 0x1B3C }, { 0x005B, 0x1B3C },
{ 0x005C, 0x1B2F }, { 0x005C, 0x1B2F },
@ -154,8 +150,7 @@ static const struct codepoint turkish_ext_unicode[] =
}; };
/* Appendix A.2.2. in 3GPP TS23.038 V.8.2.0*/ /* Appendix A.2.2. in 3GPP TS23.038 V.8.2.0*/
static const struct codepoint spanish_ext_gsm[] = static const struct codepoint spanish_ext_gsm[] = {
{
{ 0x09, 0x00E7 }, { 0x09, 0x00E7 },
{ 0x0A, 0x000C }, /* See NOTE 3 */ { 0x0A, 0x000C }, /* See NOTE 3 */
{ 0x14, 0x005E }, { 0x14, 0x005E },
@ -178,8 +173,7 @@ static const struct codepoint spanish_ext_gsm[] =
{ 0x75, 0x00FA } { 0x75, 0x00FA }
}; };
static const struct codepoint spanish_ext_unicode[] = static const struct codepoint spanish_ext_unicode[] = {
{
{ 0x000C, 0x1B0A }, { 0x000C, 0x1B0A },
{ 0x005B, 0x1B3C }, { 0x005B, 0x1B3C },
{ 0x005C, 0x1B2F }, { 0x005C, 0x1B2F },
@ -202,8 +196,7 @@ static const struct codepoint spanish_ext_unicode[] =
}; };
/* Appendix A.2.3. in 3GPP TS23.038 V.8.2.0 */ /* Appendix A.2.3. in 3GPP TS23.038 V.8.2.0 */
static const struct codepoint portuguese_ext_gsm[] = static const struct codepoint portuguese_ext_gsm[] = {
{
{ 0x05, 0x00EA }, { 0x05, 0x00EA },
{ 0x09, 0x00E7 }, { 0x09, 0x00E7 },
{ 0x0A, 0x000C }, /* See NOTE 3 */ { 0x0A, 0x000C }, /* See NOTE 3 */
@ -244,8 +237,7 @@ static const struct codepoint portuguese_ext_gsm[] =
{ 0x7F, 0x00E2 } { 0x7F, 0x00E2 }
}; };
static const struct codepoint portuguese_ext_unicode[] = static const struct codepoint portuguese_ext_unicode[] = {
{
{ 0x000C, 0x1B0A }, { 0x000C, 0x1B0A },
{ 0x005B, 0x1B3C }, { 0x005B, 0x1B3C },
{ 0x005C, 0x1B2F }, { 0x005C, 0x1B2F },
@ -286,8 +278,7 @@ static const struct codepoint portuguese_ext_unicode[] =
}; };
/* Used for conversion of GSM to Unicode */ /* Used for conversion of GSM to Unicode */
static const unsigned short default_gsm[] = static const unsigned short default_gsm[] = {
{
0x0040, 0x00A3, 0x0024, 0x00A5, 0x00E8, 0x00E9, 0x00F9, 0x00EC, /* 0x07 */ 0x0040, 0x00A3, 0x0024, 0x00A5, 0x00E8, 0x00E9, 0x00F9, 0x00EC, /* 0x07 */
0x00F2, 0x00C7, 0x000A, 0x00D8, 0x00F8, 0x000D, 0x00C5, 0x00E5, /* 0x0F */ 0x00F2, 0x00C7, 0x000A, 0x00D8, 0x00F8, 0x000D, 0x00C5, 0x00E5, /* 0x0F */
0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, /* 0x17 */ 0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, /* 0x17 */
@ -306,8 +297,7 @@ static const unsigned short default_gsm[] =
0x0078, 0x0079, 0x007A, 0x00E4, 0x00F6, 0x00F1, 0x00FC, 0x00E0 /* 0x7F */ 0x0078, 0x0079, 0x007A, 0x00E4, 0x00F6, 0x00F1, 0x00FC, 0x00E0 /* 0x7F */
}; };
static const struct codepoint default_unicode[] = static const struct codepoint default_unicode[] = {
{
{ 0x000A, 0x0A }, { 0x000D, 0x0D }, { 0x0020, 0x20 }, { 0x0021, 0x21 }, { 0x000A, 0x0A }, { 0x000D, 0x0D }, { 0x0020, 0x20 }, { 0x0021, 0x21 },
{ 0x0022, 0x22 }, { 0x0023, 0x23 }, { 0x0024, 0x02 }, { 0x0025, 0x25 }, { 0x0022, 0x22 }, { 0x0023, 0x23 }, { 0x0024, 0x02 }, { 0x0025, 0x25 },
{ 0x0026, 0x26 }, { 0x0027, 0x27 }, { 0x0028, 0x28 }, { 0x0029, 0x29 }, { 0x0026, 0x26 }, { 0x0027, 0x27 }, { 0x0028, 0x28 }, { 0x0029, 0x29 },
@ -343,8 +333,7 @@ static const struct codepoint default_unicode[] =
}; };
/* Appendix A.3.1 in 3GPP TS23.038 */ /* Appendix A.3.1 in 3GPP TS23.038 */
static const unsigned short turkish_gsm[] = static const unsigned short turkish_gsm[] = {
{
0x0040, 0x00A3, 0x0024, 0x00A5, 0x20AC, 0x00E9, 0x00F9, 0x0131, /* 0x07 */ 0x0040, 0x00A3, 0x0024, 0x00A5, 0x20AC, 0x00E9, 0x00F9, 0x0131, /* 0x07 */
0x00F2, 0x00C7, 0x000A, 0x011E, 0x011F, 0x000D, 0x00C5, 0x00E5, /* 0x0F */ 0x00F2, 0x00C7, 0x000A, 0x011E, 0x011F, 0x000D, 0x00C5, 0x00E5, /* 0x0F */
0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, /* 0x17 */ 0x0394, 0x005F, 0x03A6, 0x0393, 0x039B, 0x03A9, 0x03A0, 0x03A8, /* 0x17 */
@ -363,8 +352,7 @@ static const unsigned short turkish_gsm[] =
0x0078, 0x0079, 0x007A, 0x00E4, 0x00F6, 0x00F1, 0x00FC, 0x00E0 /* 0x7F */ 0x0078, 0x0079, 0x007A, 0x00E4, 0x00F6, 0x00F1, 0x00FC, 0x00E0 /* 0x7F */
}; };
static const struct codepoint turkish_unicode[] = static const struct codepoint turkish_unicode[] = {
{
{ 0x000A, 0x0A }, { 0x000D, 0x0D }, { 0x0020, 0x20 }, { 0x0021, 0x21 }, { 0x000A, 0x0A }, { 0x000D, 0x0D }, { 0x0020, 0x20 }, { 0x0021, 0x21 },
{ 0x0022, 0x22 }, { 0x0023, 0x23 }, { 0x0024, 0x02 }, { 0x0025, 0x25 }, { 0x0022, 0x22 }, { 0x0023, 0x23 }, { 0x0024, 0x02 }, { 0x0025, 0x25 },
{ 0x0026, 0x26 }, { 0x0027, 0x27 }, { 0x0028, 0x28 }, { 0x0029, 0x29 }, { 0x0026, 0x26 }, { 0x0027, 0x27 }, { 0x0028, 0x28 }, { 0x0029, 0x29 },
@ -400,8 +388,7 @@ static const struct codepoint turkish_unicode[] =
}; };
/* Appendix A.3.2 in 3GPP TS23.038 */ /* Appendix A.3.2 in 3GPP TS23.038 */
static const unsigned short portuguese_gsm[] = static const unsigned short portuguese_gsm[] = {
{
0x0040, 0x00A3, 0x0024, 0x00A5, 0x00EA, 0x00E9, 0x00FA, 0x00ED, /* 0x07 */ 0x0040, 0x00A3, 0x0024, 0x00A5, 0x00EA, 0x00E9, 0x00FA, 0x00ED, /* 0x07 */
0x00F3, 0x00E7, 0x000A, 0x00D4, 0x00F4, 0x000D, 0x00C1, 0x00E1, /* 0x0F */ 0x00F3, 0x00E7, 0x000A, 0x00D4, 0x00F4, 0x000D, 0x00C1, 0x00E1, /* 0x0F */
0x0394, 0x005F, 0x00AA, 0x00C7, 0x00C0, 0x221E, 0x005E, 0x005C, /* 0x17 */ 0x0394, 0x005F, 0x00AA, 0x00C7, 0x00C0, 0x221E, 0x005E, 0x005C, /* 0x17 */
@ -420,8 +407,7 @@ static const unsigned short portuguese_gsm[] =
0x0078, 0x0079, 0x007A, 0x00E3, 0x00F5, 0x0060, 0x00FC, 0x00E0 /* 0x7F */ 0x0078, 0x0079, 0x007A, 0x00E3, 0x00F5, 0x0060, 0x00FC, 0x00E0 /* 0x7F */
}; };
static const struct codepoint portuguese_unicode[] = static const struct codepoint portuguese_unicode[] = {
{
{ 0x000A, 0x0A }, { 0x000D, 0x0D }, { 0x0020, 0x20 }, { 0x0021, 0x21 }, { 0x000A, 0x0A }, { 0x000D, 0x0D }, { 0x0020, 0x20 }, { 0x0021, 0x21 },
{ 0x0022, 0x22 }, { 0x0023, 0x23 }, { 0x0024, 0x02 }, { 0x0025, 0x25 }, { 0x0022, 0x22 }, { 0x0023, 0x23 }, { 0x0024, 0x02 }, { 0x0025, 0x25 },
{ 0x0026, 0x26 }, { 0x0027, 0x27 }, { 0x0028, 0x28 }, { 0x0029, 0x29 }, { 0x0026, 0x26 }, { 0x0027, 0x27 }, { 0x0028, 0x28 }, { 0x0029, 0x29 },
@ -456,32 +442,28 @@ static const struct codepoint portuguese_unicode[] =
{ 0x00FC, 0x7E }, { 0x0394, 0x10 }, { 0x20AC, 0x18 }, { 0x221E, 0x15 } { 0x00FC, 0x7E }, { 0x0394, 0x10 }, { 0x20AC, 0x18 }, { 0x221E, 0x15 }
}; };
static const struct single_shift_table gsm_single_shift[] = static const struct single_shift_table gsm_single_shift[] = {
{
{ default_ext_gsm, TABLE_SIZE(default_ext_gsm) }, { default_ext_gsm, TABLE_SIZE(default_ext_gsm) },
{ turkish_ext_gsm, TABLE_SIZE(turkish_ext_gsm) }, { turkish_ext_gsm, TABLE_SIZE(turkish_ext_gsm) },
{ spanish_ext_gsm, TABLE_SIZE(spanish_ext_gsm) }, { spanish_ext_gsm, TABLE_SIZE(spanish_ext_gsm) },
{ portuguese_ext_gsm, TABLE_SIZE(portuguese_ext_gsm) } { portuguese_ext_gsm, TABLE_SIZE(portuguese_ext_gsm) }
}; };
static const struct single_shift_table unicode_single_shift[] = static const struct single_shift_table unicode_single_shift[] = {
{
{ default_ext_unicode, TABLE_SIZE(default_ext_unicode) }, { default_ext_unicode, TABLE_SIZE(default_ext_unicode) },
{ turkish_ext_unicode, TABLE_SIZE(turkish_ext_unicode) }, { turkish_ext_unicode, TABLE_SIZE(turkish_ext_unicode) },
{ spanish_ext_unicode, TABLE_SIZE(spanish_ext_unicode) }, { spanish_ext_unicode, TABLE_SIZE(spanish_ext_unicode) },
{ portuguese_ext_unicode, TABLE_SIZE(portuguese_ext_unicode) } { portuguese_ext_unicode, TABLE_SIZE(portuguese_ext_unicode) }
}; };
static const unsigned short *gsm_locking_shift[] = static const unsigned short *gsm_locking_shift[] = {
{
default_gsm, default_gsm,
turkish_gsm, turkish_gsm,
default_gsm, default_gsm,
portuguese_gsm portuguese_gsm
}; };
static const struct codepoint *unicode_locking_shift[] = static const struct codepoint *unicode_locking_shift[] = {
{
default_unicode, default_unicode,
turkish_unicode, turkish_unicode,
default_unicode, default_unicode,