4 files changed, 21 insertions, 29 deletions

diff --git a/lib/erl_interface/src/encode/encode_pid.c b/lib/erl_interface/src/encode/encode_pid.c
index e1316f3355..264dc1dd4e 100644
--- a/lib/erl_interface/src/encode/encode_pid.c
+++ b/lib/erl_interface/src/encode/encode_pid.c
@@ -25,7 +25,6 @@
 int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
 {
   char* s = buf + *index;
-  const char tag = (p->creation > 3) ? ERL_NEW_PID_EXT : ERL_PID_EXT;
 
   ++(*index); /* skip ERL_PID_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node),
@@ -33,21 +32,17 @@ int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
       return -1;
 
   if (buf) {
-    put8(s, tag);
+    put8(s, ERL_NEW_PID_EXT);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->num & 0x7fff); /* 15 bits */
     put32be(s,p->serial & 0x1fff); /* 13 bits */
-    if (tag == ERL_PID_EXT) {
-        put8(s,(p->creation & 0x03)); /* 2 bits */
-    } else {
-        put32be(s, p->creation); /* 32 bits */
-    }
+    put32be(s, p->creation); /* 32 bits */
   }
 
-  *index += 4 + 4 + (tag == ERL_PID_EXT ? 1 : 4);
+  *index += 4 + 4 + 4;
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_port.c b/lib/erl_interface/src/encode/encode_port.c
index c4fd5c40a8..4d0d1f9290 100644
--- a/lib/erl_interface/src/encode/encode_port.c
+++ b/lib/erl_interface/src/encode/encode_port.c
@@ -25,7 +25,6 @@
 int ei_encode_port(char *buf, int *index, const erlang_port *p)
 {
   char *s = buf + *index;
-  const char tag = p->creation > 3 ? ERL_NEW_PORT_EXT : ERL_PORT_EXT;
 
   ++(*index); /* skip ERL_PORT_EXT */
   if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node), ERLANG_UTF8,
@@ -33,19 +32,15 @@ int ei_encode_port(char *buf, int *index, const erlang_port *p)
       return -1;
   }
   if (buf) {
-    put8(s, tag);
+    put8(s, ERL_NEW_PORT_EXT);
 
     s = buf + *index;
 
     /* now the integers */
     put32be(s,p->id & 0x0fffffff /* 28 bits */);
-    if (tag == ERL_PORT_EXT) {
-        put8(s,(p->creation & 0x03));
-    } else {
-        put32be(s, p->creation);
-    }
+    put32be(s, p->creation);
   }
-  *index += 4 + (tag == ERL_PORT_EXT ? 1 : 4);
+  *index += 4 + 4;
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_ref.c b/lib/erl_interface/src/encode/encode_ref.c
index e24ee392cc..7e65d647ec 100644
--- a/lib/erl_interface/src/encode/encode_ref.c
+++ b/lib/erl_interface/src/encode/encode_ref.c
@@ -24,7 +24,6 @@
 
 int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 {
-  const char tag = (p->creation > 3) ? ERL_NEWER_REFERENCE_EXT : ERL_NEW_REFERENCE_EXT;
   char *s = buf + *index;
   int i;
 
@@ -37,7 +36,7 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
   /* Always encode as an extended reference; all participating parties
      are now expected to be able to decode extended references. */
   if (buf) {
-	  put8(s, tag);
+	  put8(s, ERL_NEWER_REFERENCE_EXT);
 
 	  /* first, number of integers */
 	  put16be(s, p->len);
@@ -46,15 +45,12 @@ int ei_encode_ref(char *buf, int *index, const erlang_ref *p)
 	  s = buf + *index;
 
 	  /* now the integers */
-          if (tag == ERL_NEW_REFERENCE_EXT)
-              put8(s,(p->creation & 0x03));
-          else
-              put32be(s, p->creation);
+          put32be(s, p->creation);
 	  for (i = 0; i < p->len; i++)
 	      put32be(s,p->n[i]);
   }
   
-  *index += p->len*4 + (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4);
+  *index += p->len*4 + 4;
   return 0;
 }
 
diff --git a/lib/erl_interface/src/encode/encode_trace.c b/lib/erl_interface/src/encode/encode_trace.c
index d0e6aec474..4c51e3d84b 100644
--- a/lib/erl_interface/src/encode/encode_trace.c
+++ b/lib/erl_interface/src/encode/encode_trace.c
@@ -23,12 +23,18 @@
 int ei_encode_trace(char *buf, int *index, const erlang_trace *p)
 {
   /* { Flags, Label, Serial, FromPid, Prev } */
-  ei_encode_tuple_header(buf,index,5);
-  ei_encode_long(buf,index,p->flags);
-  ei_encode_long(buf,index,p->label);
-  ei_encode_long(buf,index,p->serial);
-  ei_encode_pid(buf,index,&p->from);
-  ei_encode_long(buf,index,p->prev);
+    if (ei_encode_tuple_header(buf,index,5) < 0)
+        return -1;
+    if (ei_encode_long(buf,index,p->flags) < 0)
+        return -1;
+    if (ei_encode_long(buf,index,p->label) < 0)
+        return -1;
+    if (ei_encode_long(buf,index,p->serial) < 0)
+        return -1;
+    if (ei_encode_pid(buf,index,&p->from) < 0)
+        return -1;
+    if (ei_encode_long(buf,index,p->prev) < 0)
+        return -1;
 
   /* index is updated by the functions we called */