diff options
| author | Sverker Eriksson <[email protected]> | 2014-09-17 20:49:22 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-09-17 20:49:22 +0200 |
| commit | 86b7cf42011302a78cb73ec4f339a2b31af8ae9a (patch) | |
| tree | ed946bbce166d1c012788522f5508ec01fa006a2 /erts/emulator/beam/erl_nif.c | |
| parent | 723fea8f585c3006aa5cbda7d33de44d054eeafa (diff) | |
| parent | 933a5f071e0dc7f2051e1ccc58ca4e361db52ef4 (diff) | |
| download | otp-86b7cf42011302a78cb73ec4f339a2b31af8ae9a.tar.gz otp-86b7cf42011302a78cb73ec4f339a2b31af8ae9a.tar.bz2 otp-86b7cf42011302a78cb73ec4f339a2b31af8ae9a.zip | |
Merge branch 'sverk/bin-alloc-refactor'
* sverk/bin-alloc-refactor:
erts: Fix gdb command etp-carrier-blocks for 32-bit
erts: Refactor binary allocation interface to also initialize Binary
Diffstat (limited to 'erts/emulator/beam/erl_nif.c')
| -rw-r--r-- | erts/emulator/beam/erl_nif.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index ede5f335dc..3708133f40 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -551,9 +551,7 @@ int enif_alloc_binary(size_t size, ErlNifBinary* bin) if (refbin == NULL) { return 0; /* The NIF must take action */ } - refbin->flags = BIN_FLAG_DRV; /* BUGBUG: Flag? */ erts_refc_init(&refbin->refc, 1); - refbin->orig_size = (SWord) size; bin->size = size; bin->data = (unsigned char*) refbin->orig_bytes; @@ -573,7 +571,6 @@ int enif_realloc_binary(ErlNifBinary* bin, size_t size) if (!newbin) { return 0; } - newbin->orig_size = size; bin->ref_bin = newbin; bin->data = (unsigned char*) newbin->orig_bytes; bin->size = size; |