diff options
| author | Sverker Eriksson <[email protected]> | 2019-05-02 13:34:04 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-05-02 13:34:04 +0200 |
| commit | 6939b6908c39b1a0a68f588cffcafc222a038bb9 (patch) | |
| tree | 527b3f039ae67892910c09e2806801403512ed00 /lib/erl_interface/include/ei.h | |
| parent | 37bc04b573bc4a088e98a9cc5586a35c99b9eb00 (diff) | |
| parent | 01aa8b82dd0f8229355ffd2bb2bc8e8f496d2df6 (diff) | |
| download | otp-6939b6908c39b1a0a68f588cffcafc222a038bb9.tar.gz otp-6939b6908c39b1a0a68f588cffcafc222a038bb9.tar.bz2 otp-6939b6908c39b1a0a68f588cffcafc222a038bb9.zip | |
Merge branch 'sverker/erl_interface/bitstring-api'
* sverker/erl_interface/bitstring-api:
erl_interface: Tweak bit string encode/decode API
Diffstat (limited to 'lib/erl_interface/include/ei.h')
| -rw-r--r-- | lib/erl_interface/include/ei.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/erl_interface/include/ei.h b/lib/erl_interface/include/ei.h index a860df3f77..ed0420300d 100644 --- a/lib/erl_interface/include/ei.h +++ b/lib/erl_interface/include/ei.h @@ -526,9 +526,9 @@ int ei_x_encode_atom_len(ei_x_buff* x, const char* s, int len); int ei_x_encode_atom_len_as(ei_x_buff* x, const char* s, int len, erlang_char_encoding from, erlang_char_encoding to); int ei_encode_binary(char *buf, int *index, const void *p, long len); -int ei_encode_bitstring(char *buf, int *index, const void *p, size_t bits); +int ei_encode_bitstring(char *buf, int *index, const char *p, size_t bitoffs, size_t bits); int ei_x_encode_binary(ei_x_buff* x, const void* s, int len); -int ei_x_encode_bitstring(ei_x_buff* x, const void* p, size_t bits); +int ei_x_encode_bitstring(ei_x_buff* x, const char* p, size_t bitoffs, size_t bits); int ei_encode_pid(char *buf, int *index, const erlang_pid *p); int ei_x_encode_pid(ei_x_buff* x, const erlang_pid* pid); int ei_encode_fun(char* buf, int* index, const erlang_fun* p); @@ -578,7 +578,9 @@ int ei_decode_string(const char *buf, int *index, char *p); int ei_decode_atom(const char *buf, int *index, char *p); int ei_decode_atom_as(const char *buf, int *index, char *p, int destlen, erlang_char_encoding want, erlang_char_encoding* was, erlang_char_encoding* result); int ei_decode_binary(const char *buf, int *index, void *p, long *len); -int ei_decode_bitstring(const char *buf, int *index, void *p, size_t plen, size_t *bitsp); +int ei_decode_bitstring(const char *buf, int *index, const char** pp, + unsigned int* bitoffsp, size_t *nbitsp); + int ei_decode_fun(const char* buf, int* index, erlang_fun* p); void free_fun(erlang_fun* f); int ei_decode_pid(const char *buf, int *index, erlang_pid *p); |