diff options
| author | Sverker Eriksson <[email protected]> | 2013-02-08 16:23:48 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-02-08 16:23:48 +0100 |
| commit | 27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b (patch) | |
| tree | c6017fc754dc4ff2f39dc7989009d31c8fd9a81c /lib/erl_interface/src/decode | |
| parent | 7d1060c624676c5dde532d1cb59fa177329f4178 (diff) | |
| parent | b0693061137de237c38965c556c7d6ded8977394 (diff) | |
| download | otp-27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b.tar.gz otp-27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b.tar.bz2 otp-27d5ba9e31c666bd0a7e278b02df3a5b4ecb8e0b.zip | |
Merge branch 'sverk/erl_interface-enum-typedef'
* sverk/erl_interface-enum-typedef:
erl_interface: Change enum erlang_char_encoding to a typedef
Diffstat (limited to 'lib/erl_interface/src/decode')
| -rw-r--r-- | lib/erl_interface/src/decode/decode_atom.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/erl_interface/src/decode/decode_atom.c b/lib/erl_interface/src/decode/decode_atom.c index af4fc114d1..44fd4df12c 100644 --- a/lib/erl_interface/src/decode/decode_atom.c +++ b/lib/erl_interface/src/decode/decode_atom.c @@ -28,14 +28,14 @@ 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, - enum erlang_char_encoding want_enc, - enum erlang_char_encoding* was_encp, - enum erlang_char_encoding* res_encp) + erlang_char_encoding want_enc, + erlang_char_encoding* was_encp, + erlang_char_encoding* res_encp) { const char *s = buf + *index; const char *s0 = s; int len; - enum erlang_char_encoding got_enc; + erlang_char_encoding got_enc; switch (get8(s)) { case ERL_ATOM_EXT: @@ -92,7 +92,7 @@ int ei_decode_atom_as(const char *buf, int *index, char* p, int destlen, int utf8_to_latin1(char* dst, const char* src, int slen, int destlen, - enum erlang_char_encoding* res_encp) + erlang_char_encoding* res_encp) { const char* const dst_start = dst; const char* const dst_end = dst + destlen; @@ -128,7 +128,7 @@ int utf8_to_latin1(char* dst, const char* src, int slen, int destlen, } int latin1_to_utf8(char* dst, const char* src, int slen, int destlen, - enum erlang_char_encoding* res_encp) + erlang_char_encoding* res_encp) { const char* const src_end = src + slen; const char* const dst_start = dst; @@ -163,7 +163,7 @@ int latin1_to_utf8(char* dst, const char* src, int slen, int destlen, int ei_internal_get_atom(const char** bufp, char* p, - enum erlang_char_encoding* was_encp) + erlang_char_encoding* was_encp) { int ix = 0; if (ei_decode_atom_as(*bufp, &ix, p, MAXATOMLEN_UTF8, ERLANG_UTF8, was_encp, NULL) < 0) |