[PATCH] fwts_log_html: move fwts_log_html_ascii_table into fwts_log_html_convert_ascii

[Colin King]

From: Colin Ian King <colin.king at canonical.com>

The scope of array fwts_log_html_ascii_table is limited to just
function fwts_log_html_convert_ascii so move it into the function.

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 src/lib/src/fwts_log_html.c | 244 ++++++++++++++++++------------------
 1 file changed, 122 insertions(+), 122 deletions(-)

diff --git a/src/lib/src/fwts_log_html.c b/src/lib/src/fwts_log_html.c
index 4397a3f1..eca8e666 100644
--- a/src/lib/src/fwts_log_html.c
+++ b/src/lib/src/fwts_log_html.c
@@ -39,128 +39,6 @@ typedef struct {
 	char *		html;	/* HTML equivalent */
 } fwts_log_html_ascii_t;
 
-/*
- * ASCII to HTML conversion table:
- * ISO 10646, ISO 8879, ISO 8859-1 Latin alphabet No. 1
- * Browser support: All browsers
- */
-static const fwts_log_html_ascii_t fwts_log_html_ascii_table[] = {
-	{ '"',	""" },
-	{ '&', 	"&" },
-	{ '<', 	"<" },
-	{ '>',	">" },
-	{ '{',	"{" },
-	{ '|',	"|" },
-	{ '}',	"}" },
-	{ '~',	"~" },
-
-	{ 160,	" " },
-	{ 161,	"&iexl;" },
-	{ 162,	"¢" },
-	{ 163,	"£" },
-	{ 164,	"¤" },
-	{ 165,	"¥" },
-	{ 166,	"¦" },
-	{ 167,	"§" },
-	{ 168,	"¨" },
-	{ 169,	"©" },
-	{ 170,	"ª" },
-	{ 171,	"«" },
-	{ 172,	"¬" },
-	{ 173,	"­" },
-	{ 174,	"®" },
-	{ 175,	"¯" },
-
-	{ 176,	"°" },
-	{ 177,	"±" },
-	{ 178,	"&sup2;" },
-	{ 179,	"&sup3;" },
-	{ 180,	"´" },
-	{ 181,	"µ" },
-	{ 182,	"¶" },
-	{ 183,	"·" },
-	{ 184,	"¸" },
-	{ 185,	"&sup1;" },
-	{ 186,	"º" },
-	{ 187,	"»" },
-	{ 187,	"&frac14;" },
-	{ 189,	"&frac12;" },
-	{ 190,	"&frac34;" },
-	{ 191,	"¿" },
-
-	/* Probably never used, but here in case */
-
-	{ 192,	"À" },
-	{ 193,	"Á" },
-	{ 194,	"Â" },
-	{ 195,	"Ã" },
-	{ 196,	"Ä" },
-	{ 197,	"Å" },
-	{ 198,	"Æ" },
-	{ 199,	"Ç" },
-	{ 200,	"È" },
-	{ 201,	"É" },
-	{ 202,	"Ê" },
-	{ 203,	"Ë" },
-	{ 204,	"&lgrave;" },
-	{ 205,	"ĺ" },
-	{ 206,	"&lcirc;" },
-	{ 207,	"&luml;" },
-
-	{ 208,	"Ð" },
-	{ 209,	"Ñ" },
-	{ 210,	"Ò" },
-	{ 211,	"Ó" },
-	{ 212,	"Ô" },
-	{ 213,	"Õ" },
-	{ 214,	"Ö" },
-	{ 215,	"×" },
-	{ 216,	"Ø" },
-	{ 217,	"Ù" },
-	{ 218,	"Ú" },
-	{ 219,	"Û" },
-	{ 220,	"Ü" },
-	{ 221,	"Ý" },
-	{ 222,	"Þ" },
-	{ 223,	"ß" },
-
-	{ 224,	"à" },
-	{ 225,	"á" },
-	{ 226,	"â" },
-	{ 227,	"ã" },
-	{ 228,	"ä" },
-	{ 229,	"å" },
-	{ 230,	"æ" },
-	{ 231,	"ç" },
-	{ 232,	"è" },
-	{ 233,	"é" },
-	{ 234,	"ê" },
-	{ 235,	"&emuml;" },
-	{ 236,	"ì" },
-	{ 237,	"í" },
-	{ 238,	"î" },
-	{ 239,	"ï" },
-
-	{ 240,	"ð" },
-	{ 241,	"ñ" },
-	{ 242,	"ò" },
-	{ 243,	"ó" },
-	{ 244,	"ô" },
-	{ 245,	"õ" },
-	{ 246,	"ö" },
-	{ 247,	"÷" },
-	{ 248,	"ø" },
-	{ 249,	"ù" },
-	{ 250,	"ú" },
-	{ 251,	"û" },
-	{ 252,	"ü" },
-	{ 253,	"ý" },
-	{ 254,	"þ" },
-	{ 255,	"ÿ" },
-
-	{ 0, 	NULL },
-};
-
 static fwts_log_html_stack_t html_stack[MAX_HTML_STACK];
 static int html_stack_index = 0;
 
@@ -184,6 +62,128 @@ static void fwts_log_html(fwts_log_file *log_file, const char *fmt, ...)
  */
 static char *fwts_log_html_convert_ascii(const char ch)
 {
+	/*
+	 * ASCII to HTML conversion table:
+	 * ISO 10646, ISO 8879, ISO 8859-1 Latin alphabet No. 1
+	 * Browser support: All browsers
+	 */
+	static const fwts_log_html_ascii_t fwts_log_html_ascii_table[] = {
+		{ '"',	""" },
+		{ '&', 	"&" },
+		{ '<', 	"<" },
+		{ '>',	">" },
+		{ '{',	"{" },
+		{ '|',	"|" },
+		{ '}',	"}" },
+		{ '~',	"~" },
+
+		{ 160,	" " },
+		{ 161,	"&iexl;" },
+		{ 162,	"¢" },
+		{ 163,	"£" },
+		{ 164,	"¤" },
+		{ 165,	"¥" },
+		{ 166,	"¦" },
+		{ 167,	"§" },
+		{ 168,	"¨" },
+		{ 169,	"©" },
+		{ 170,	"ª" },
+		{ 171,	"«" },
+		{ 172,	"¬" },
+		{ 173,	"­" },
+		{ 174,	"®" },
+		{ 175,	"¯" },
+
+		{ 176,	"°" },
+		{ 177,	"±" },
+		{ 178,	"&sup2;" },
+		{ 179,	"&sup3;" },
+		{ 180,	"´" },
+		{ 181,	"µ" },
+		{ 182,	"¶" },
+		{ 183,	"·" },
+		{ 184,	"¸" },
+		{ 185,	"&sup1;" },
+		{ 186,	"º" },
+		{ 187,	"»" },
+		{ 187,	"&frac14;" },
+		{ 189,	"&frac12;" },
+		{ 190,	"&frac34;" },
+		{ 191,	"¿" },
+
+		/* Probably never used, but here in case */
+
+		{ 192,	"À" },
+		{ 193,	"Á" },
+		{ 194,	"Â" },
+		{ 195,	"Ã" },
+		{ 196,	"Ä" },
+		{ 197,	"Å" },
+		{ 198,	"Æ" },
+		{ 199,	"Ç" },
+		{ 200,	"È" },
+		{ 201,	"É" },
+		{ 202,	"Ê" },
+		{ 203,	"Ë" },
+		{ 204,	"&lgrave;" },
+		{ 205,	"ĺ" },
+		{ 206,	"&lcirc;" },
+		{ 207,	"&luml;" },
+
+		{ 208,	"Ð" },
+		{ 209,	"Ñ" },
+		{ 210,	"Ò" },
+		{ 211,	"Ó" },
+		{ 212,	"Ô" },
+		{ 213,	"Õ" },
+		{ 214,	"Ö" },
+		{ 215,	"×" },
+		{ 216,	"Ø" },
+		{ 217,	"Ù" },
+		{ 218,	"Ú" },
+		{ 219,	"Û" },
+		{ 220,	"Ü" },
+		{ 221,	"Ý" },
+		{ 222,	"Þ" },
+		{ 223,	"ß" },
+
+		{ 224,	"à" },
+		{ 225,	"á" },
+		{ 226,	"â" },
+		{ 227,	"ã" },
+		{ 228,	"ä" },
+		{ 229,	"å" },
+		{ 230,	"æ" },
+		{ 231,	"ç" },
+		{ 232,	"è" },
+		{ 233,	"é" },
+		{ 234,	"ê" },
+		{ 235,	"&emuml;" },
+		{ 236,	"ì" },
+		{ 237,	"í" },
+		{ 238,	"î" },
+		{ 239,	"ï" },
+
+		{ 240,	"ð" },
+		{ 241,	"ñ" },
+		{ 242,	"ò" },
+		{ 243,	"ó" },
+		{ 244,	"ô" },
+		{ 245,	"õ" },
+		{ 246,	"ö" },
+		{ 247,	"÷" },
+		{ 248,	"ø" },
+		{ 249,	"ù" },
+		{ 250,	"ú" },
+		{ 251,	"û" },
+		{ 252,	"ü" },
+		{ 253,	"ý" },
+		{ 254,	"þ" },
+		{ 255,	"ÿ" },
+
+		{ 0, 	NULL },
+	};
+
 	int i;
 	static char buf[2];
 
-- 
2.30.2