Skip to content

gh-103583: Isolate CJK codec modules #103869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
erlend-aasland merged 7 commits into from
Apr 27, 2023
Merged

gh-103583: Isolate CJK codec modules #103869

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb2c9e7
Pass codec iso. config to mbcodec API handlers
erlend-aasland Apr 26, 2023
409bf98
Add cjk module state pointer to MultibyteCodec struct
erlend-aasland Apr 26, 2023
fd6a2a0
Make it possible to specify cjk module specific state
erlend-aasland Apr 26, 2023
eb44ae6
PoC: put big5 codec in cjk module state
erlend-aasland Apr 26, 2023
f6ed5df
PoC: iso2022 codecs
erlend-aasland Apr 26, 2023
ef983c4
Add NEWS
erlend-aasland Apr 26, 2023
dec79a7
Merge branch 'main' into isolate-cjk-alt2
erlend-aasland Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add cjk module state pointer to MultibyteCodec struct 
Lifetime should be guaranteed, since each MultibyteCodecObjects owns a
reference the cjk codec module that owns the memory of the
MultibyteCodec struct.
  • Loading branch information
@erlend-aasland
erlend-aasland committed Apr 26, 2023
commit 409bf98b512488540c09a180a77d264a44577dfc
11 changes: 7 additions & 4 deletions Modules/cjkcodecs/cjkcodecs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ struct pair_encodemap {
DBCHAR code;
};

typedef struct {
typedef struct _cjk_mod_state {
int num_mappings;
int num_codecs;
struct dbcs_map *mapping_list;
Expand Down Expand Up @@ -271,9 +271,12 @@ add_codecs(cjkcodecs_module_state *st) \
#define CODEC_STATELESS_WINIT(enc) \
NEXT_CODEC = (MultibyteCodec){#enc, NULL, enc##_codec_init, _STATELESS_METHODS(enc)};

#define END_CODECS_LIST \
assert(st->num_codecs == idx); \
return 0; \
#define END_CODECS_LIST \
assert(st->num_codecs == idx); \
for (int i = 0; i < st->num_codecs; i++) { \
st->codec_list[i].modstate = st; \
} \
return 0; \
}


Expand Down
2 changes: 2 additions & 0 deletions Modules/cjkcodecs/multibytecodec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ typedef struct {
unsigned char c[8];
} MultibyteCodec_State;

struct _cjk_mod_state;
struct _multibyte_codec;

typedef int (*mbcodec_init)(const struct _multibyte_codec *codec);
Expand Down Expand Up @@ -60,6 +61,7 @@ typedef struct _multibyte_codec {
mbdecode_func decode;
mbdecodeinit_func decinit;
mbdecodereset_func decreset;
struct _cjk_mod_state *modstate;
} MultibyteCodec;

typedef struct {
Expand Down