system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 14:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce BSS size for programs which not load collate by eliminating

Browse source 
static buffer.
This commit is contained in:
Andrey A. Chernov 2002-08-13 14:55:17 +00:00
parent 635e2e682b
commit a2a26d0a3d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=101820
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/libc/locale/collate.c
View file

@ -60,7 +60,7 @@ __collate_load_tables(const char *encoding)
int i, saverr;
char collate_version[STR_LEN];
char buf[PATH_MAX];
char *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table;
void *TMP_substitute_table, *TMP_char_pri_table, *TMP_chain_pri_table;
static char collate_encoding[ENCODING_LEN + 1];
/* 'encoding' must be already checked. */
@ -143,15 +143,15 @@ __collate_load_tables(const char *encoding)
(void)fclose(fp);
(void)strcpy(collate_encoding, encoding);
(void)memcpy(__collate_substitute_table, TMP_substitute_table,
sizeof(__collate_substitute_table));
(void)memcpy(__collate_char_pri_table, TMP_char_pri_table,
sizeof(__collate_char_pri_table));
(void)memcpy(__collate_chain_pri_table, TMP_chain_pri_table,
sizeof(__collate_chain_pri_table));
free(TMP_substitute_table);
free(TMP_char_pri_table);
free(TMP_chain_pri_table);
if (__collate_substitute_table_ptr != NULL)
free(__collate_substitute_table_ptr);
__collate_substitute_table_ptr = TMP_substitute_table;
if (__collate_char_pri_table_ptr != NULL)
free(__collate_char_pri_table_ptr);
__collate_char_pri_table_ptr = TMP_char_pri_table;
if (__collate_chain_pri_table_ptr != NULL)
free(__collate_chain_pri_table_ptr);
__collate_chain_pri_table_ptr = TMP_chain_pri_table;
__collate_substitute_nontrivial = 0;
for (i = 0; i < UCHAR_MAX + 1; i++) {

3
lib/libc/locale/collate.h
View file

@ -48,8 +48,11 @@ struct __collate_st_chain_pri {
extern int __collate_load_error;
extern int __collate_substitute_nontrivial;
#define __collate_substitute_table (*__collate_substitute_table_ptr)
extern u_char __collate_substitute_table[UCHAR_MAX + 1][STR_LEN];
#define __collate_char_pri_table (*__collate_char_pri_table_ptr)
extern struct __collate_st_char_pri __collate_char_pri_table[UCHAR_MAX + 1];
#define __collate_chain_pri_table (*__collate_chain_pri_table_ptr)
extern struct __collate_st_chain_pri __collate_chain_pri_table[TABLE_SIZE];
__BEGIN_DECLS