[erlang-patches] revised patch for binary_to_term/2 and clarifying comment

Björn Gustavsson <>
Fri Jan 8 14:39:18 CET 2010


Thanks!

On Fri, Jan 8, 2010 at 10:06 AM, Jayson Vantuyl <> wrote:
> I've pushed a branch with the following changes:
>
> 1.  I rebased the latest safety / binary_to_term/2 patch off of the now current ccase/r13b04_dev
> 2.  Otherwise, the first changeset is identical to the already submitted one

I made the following the following stylistic change to that commit
to match the style of the rest of the file:

diff --git a/erts/emulator/beam/external.c b/erts/emulator/beam/external.c
index e1c868b..088a551 100644
--- a/erts/emulator/beam/external.c
+++ b/erts/emulator/beam/external.c
@@ -2288,7 +2288,7 @@ dec_term_atom_common:
                    goto error;
                }
                if (edep && (edep->flags & ERTS_DIST_EXT_BTT_SAFE)) {
-                   if (!erts_find_export_entry(mod,name,arity))
+                   if (!erts_find_export_entry(mod, name, arity))
                        goto error;
                 }
                *objp = make_export(hp);

> 3.  I added an additional changeset with the comments we discussed (a warning that edep flags and mask shouldn't overlap)

The patch added two spaces at end of lines - I have eliminated them.

> I thought it deserved a separate commit, since it was really a separate change.  I would have made it a separate branch, but I didn't see the point, since it would have just conflicted with the addition of the BTT flag (thereby requiring an unnecessary merge).

Yes, I agree on both points.

The updated branch will be included in 'pu' when I'll push it later today.

-- 
Björn Gustavsson, Erlang/OTP, Ericsson AB


More information about the erlang-patches mailing list