Merge branch 'sverker/erl_interface/bitstring-api'

* sverker/erl_interface/bitstring-api:
  erl_interface: Tweak bit string encode/decode API

1 files changed, 31 insertions, 30 deletions

diff --git a/lib/erl_interface/src/decode/decode_binary.c b/lib/erl_interface/src/decode/decode_binary.c
index 2799438bef..0d28c67230 100644
--- a/lib/erl_interface/src/decode/decode_binary.c
+++ b/lib/erl_interface/src/decode/decode_binary.c
@@ -40,40 +40,41 @@ int ei_decode_binary(const char *buf, int *index, void *p, long *lenp)
   return 0; 
 }
 
-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)
 {
-  const char *s = buf + *index;
-  const char *s0 = s;
-  unsigned long len;
-  unsigned char last_bits;
-  const unsigned char tag = get8(s);
+    const char *s = buf + *index;
+    const char *s0 = s;
+    unsigned char last_bits;
+    const unsigned char tag = get8(s);
+    size_t len = get32be(s);
 
-  if (tag == ERL_BINARY_EXT) {
-      long bytes;
-      int ret = ei_decode_binary(buf, index, p, &bytes);
-      if (bitsp)
-          *bitsp = (size_t)bytes * 8;
-      return ret;
-  }
+    switch(tag) {
+    case ERL_BINARY_EXT:
+        if (nbitsp)
+            *nbitsp = len * 8;
+        break;
+    case ERL_BIT_BINARY_EXT:
+        last_bits = get8(s);
+        if (((last_bits==0) != (len==0)) || last_bits > 8)
+            return -1;
 
-  if (tag != ERL_BIT_BINARY_EXT)
-      return -1;
-
-  len = get32be(s);
-  last_bits = get8(s);
-
-  if (len > plen || ((last_bits==0) != (len==0)) || last_bits > 8)
-      return -1;
-
-  if (p)
-      memcpy(p, s, len);
-  s += len;
+        if (nbitsp)
+            *nbitsp = (len == 0) ? 0 : ((len-1) * 8) + last_bits;
+        break;
+    default:
+        return -1;
+    }
 
-  if (bitsp)
-      *bitsp = (len == 0) ? 0 : ((len-1) * 8) + last_bits;
+    if (pp)
+        *pp = s;
+    if (bitoffsp)
+        *bitoffsp = 0;
 
-  *index += s-s0;
-  return 0;
+    s += len;
+    *index += s-s0;
+    return 0;
 }