diff options
| author | Anders Svensson <[email protected]> | 2011-08-16 17:01:45 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-08-16 17:01:45 +0200 |
| commit | a7c0e439ee84d25ce18f65959be06315063a7de8 (patch) | |
| tree | b5a54174171fdd0f10d556c8a96909eb4af7f1d6 /erts/lib_src/common | |
| parent | 5a57f3798edd56caa61514378c673ff78ac397d2 (diff) | |
| parent | 46af29aac0e851105620dab25644cf27219e2b0a (diff) | |
| download | otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.gz otp-a7c0e439ee84d25ce18f65959be06315063a7de8.tar.bz2 otp-a7c0e439ee84d25ce18f65959be06315063a7de8.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'erts/lib_src/common')
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 2 | ||||
| -rw-r--r-- | erts/lib_src/common/erl_printf_format.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index 5dbf98c7d1..35b148990a 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -1511,7 +1511,7 @@ const char* parse_topology_spec_group(erts_cpu_info_t *cpuinfo, const char* xml, } } - if (cacheLevel == 0) { + if (parentCacheLevel == 0) { *core_p = 0; *processor_p = (*processor_p)++; } else { 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) |