@@ -58,9 +58,13 @@ struct _xsltFormat {
58
58
xmlChar * end ;
59
59
};
60
60
61
- static char alpha_upper_list [] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" ;
62
- static char alpha_lower_list [] = "abcdefghijklmnopqrstuvwxyz" ;
63
- static xsltFormatToken default_token ;
61
+ static const char alpha_upper_list [] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" ;
62
+ static const char alpha_lower_list [] = "abcdefghijklmnopqrstuvwxyz" ;
63
+ static const xsltFormatToken default_token = {
64
+ BAD_CAST (DEFAULT_SEPARATOR ),
65
+ DEFAULT_TOKEN ,
66
+ 1
67
+ };
64
68
65
69
/*
66
70
* Helper functions copied from libxml2
@@ -242,7 +246,7 @@ xsltNumberFormatAlpha(xsltNumberDataPtr data,
242
246
char temp_string [sizeof (double ) * CHAR_BIT * sizeof (xmlChar ) + 1 ];
243
247
char * pointer ;
244
248
int i ;
245
- char * alpha_list ;
249
+ const char * alpha_list ;
246
250
double alpha_size = (double )(sizeof (alpha_upper_list ) - 1 );
247
251
248
252
/*
@@ -364,11 +368,6 @@ xsltNumberFormatTokenize(const xmlChar *format,
364
368
int val ;
365
369
int len ;
366
370
367
- default_token .token = DEFAULT_TOKEN ;
368
- default_token .width = 1 ;
369
- default_token .separator = BAD_CAST (DEFAULT_SEPARATOR );
370
-
371
-
372
371
tokens -> start = NULL ;
373
372
tokens -> tokens [0 ].separator = NULL ;
374
373
tokens -> end = NULL ;
@@ -472,7 +471,7 @@ xsltNumberFormatInsertNumbers(xsltNumberDataPtr data,
472
471
{
473
472
int i = 0 ;
474
473
double number ;
475
- xsltFormatTokenPtr token ;
474
+ const xsltFormatToken * token ;
476
475
477
476
/*
478
477
* Handle initial non-alphanumeric token
0 commit comments