mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
* iconv/gconv_int.h (strict gconv_module): Remove all members associated with regular expressions. Use a simple string as the from name. * iconv/gconv_db.c: Remove code handling regular expressions. * iconv/gconv_conf.c: Likewise. * iconv/iconv_prog.c: Likewise. * iconv/gconv_builtin.h: Adjust for change in gconv_conf.c.
This commit is contained in:
@ -21,7 +21,6 @@
|
||||
#define _GCONV_INT_H 1
|
||||
|
||||
#include "gconv.h"
|
||||
#include <regex.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
||||
@ -76,12 +75,7 @@ struct __gconv_loaded_object
|
||||
/* Description for an available conversion module. */
|
||||
struct gconv_module
|
||||
{
|
||||
const char *from_pattern;
|
||||
const char *from_constpfx;
|
||||
size_t from_constpfx_len;
|
||||
const regex_t *from_regex;
|
||||
regex_t from_regex_mem;
|
||||
|
||||
const char *from_string;
|
||||
const char *to_string;
|
||||
|
||||
int cost_hi;
|
||||
@ -91,7 +85,6 @@ struct gconv_module
|
||||
|
||||
struct gconv_module *left; /* Prefix smaller. */
|
||||
struct gconv_module *same; /* List of entries with identical prefix. */
|
||||
struct gconv_module *matching;/* Next node with more specific prefix. */
|
||||
struct gconv_module *right; /* Prefix larger. */
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user