aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2011-08-08 15:34:05 +0200
committerHenrik Nord <henrik@erlang.org>2011-08-08 15:34:08 +0200
commit49f599b10882c7dc779d5b2bc06c4462f50209d1 (patch)
treef5d4978692131989a968e5613e9ccaf09c63e27a /erts
parent9ea7da397fa93cc2cb62e27ba2b6ca5e815e0f22 (diff)
parent53d1d7424fc435ad5846fb1d6483b7cb1b19fa3e (diff)
downloadotp-49f599b10882c7dc779d5b2bc06c4462f50209d1.tar.gz
otp-49f599b10882c7dc779d5b2bc06c4462f50209d1.tar.bz2
otp-49f599b10882c7dc779d5b2bc06c4462f50209d1.zip
Merge branch 'cg/fix-constant-logical-operand' into dev
* cg/fix-constant-logical-operand: Fix use of logical operator && with constant operand instead of bitwise &. OTP-9454
Diffstat (limited to 'erts')
-rw-r--r--erts/lib_src/common/erl_printf_format.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/lib_src/common/erl_printf_format.c b/erts/lib_src/common/erl_printf_format.c
index fba3fd723c..473791dce4 100644
--- a/erts/lib_src/common/erl_printf_format.c
+++ b/erts/lib_src/common/erl_printf_format.c
@@ -388,7 +388,7 @@ static int fmt_double(fmtfn_t fn,void*arg,double val,
max_size++;
if (precision)
max_size += precision;
- else if (fmt && FMTF_alt)
+ else if (fmt & FMTF_alt)
max_size++;
break;
case FMTC_E:
@@ -402,7 +402,7 @@ static int fmt_double(fmtfn_t fn,void*arg,double val,
max_size += 4;
if (precision)
max_size += precision;
- else if (fmt && FMTF_alt)
+ else if (fmt & FMTF_alt)
max_size++;
aexp = exp >= 0 ? exp : -exp;
if (aexp < 100)