Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0994386b authored by Danny Lin's avatar Danny Lin Committed by Rohit Sekhar
Browse files

qcacld-3.0: Fix regulatory domain country names. 

Clang warns:

../drivers/staging/qcacld-3.0/core/cds/src/cds_regdomain.c:284:43: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation]
        {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},
                                                 ^
                                                ,
../drivers/staging/qcacld-3.0/core/cds/src/cds_regdomain.c:284:38: note: place parentheses around the string literal to silence warning
        {CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},
                                            ^
../drivers/staging/qcacld-3.0/core/cds/src/cds_regdomain.c:296:45: warning: suspicious concatenation of string literals in an array initialization; did you mean to separate the elements with a comma? [-Wstring-concatenation]
        {CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
                                                   ^
                                                  ,
../drivers/staging/qcacld-3.0/core/cds/src/cds_regdomain.c:296:40: note: place parentheses around the string literal to silence warning
        {CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},
                                              ^

Change-Id: I35bc21e7946f03fc36fb912f46f742ec23cb8d99
parent d9a1ec41

drivers/staging/qcacld-3.0/core/cds/src/cds_regdomain.c

+2 −2
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = { 
	{CTRY_TRINIDAD_Y_TOBAGO, FCC3_WORLD, "TT", "TRINIDAD AND TOBAGO"},

	{CTRY_TUNISIA, ETSI3_WORLD, "TN", "TUNISIA"},

	{CTRY_TURKEY, ETSI1_WORLD, "TR", "TURKEY"},

	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC" "TURKS AND CAICOS"},

	{CTRY_TURKS_AND_CAICOS, FCC3_WORLD, "TC", "TURKS AND CAICOS"},

	{CTRY_UGANDA, FCC3_WORLD, "UG", "UGANDA"},

	{CTRY_UKRAINE, ETSI9_WORLD, "UA", "UKRAINE"},

	{CTRY_UAE, FCC3_WORLD, "AE", "UNITED ARAB EMIRATES"},
@@ -293,7 +293,7 @@ static const struct country_code_to_reg_dmn g_all_countries[] = { 
	{CTRY_VENEZUELA, FCC2_ETSIC, "VE", "VENEZUELA"},

	{CTRY_VIET_NAM, FCC3_WORLD, "VN", "VIETNAM"},

	{CTRY_VIRGIN_ISLANDS, FCC3_FCCA, "VI", "VIRGIN ISLANDS"},

	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF" "WALLIS"},

	{CTRY_WALLIS_AND_FUTUNA, ETSI1_WORLD, "WF", "WALLIS"},

	{CTRY_YEMEN, NULL1_WORLD, "YE", "YEMEN"},

	{CTRY_ZIMBABWE, ETSI1_WORLD, "ZW", "ZIMBABWE"},

	{CTRY_JAPAN15, MKK5_MKKC, "JP", "JAPAN"},