diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2017-09-05 15:43:58 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2017-09-05 15:43:58 +0000 |
| commit | 6a393f75f4ee7780d10f87a636bc7844f7157fca (patch) | |
| tree | b9bd6b4e798c20afddf78c741c3b4de94c548889 /openmp/runtime/src/kmp_affinity.cpp | |
| parent | ab48e5e2448e1f5191071f9d9460646f676b2d1d (diff) | |
| download | bcm5719-llvm-6a393f75f4ee7780d10f87a636bc7844f7157fca.tar.gz bcm5719-llvm-6a393f75f4ee7780d10f87a636bc7844f7157fca.zip | |
Minor code cleanup of Klocwork issues
Minor code cleanup of Klocwork issues. Fatal messages are given no return
attribute. Define and use KMP_NORETURN to work for multiple C++ versions.
Patch by Terry Wilmarth
Differential Revision: https://reviews.llvm.org/D37275
llvm-svn: 312538
Diffstat (limited to 'openmp/runtime/src/kmp_affinity.cpp')
| -rw-r--r-- | openmp/runtime/src/kmp_affinity.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/openmp/runtime/src/kmp_affinity.cpp b/openmp/runtime/src/kmp_affinity.cpp index 80368fd1b0b..f8428d96fbb 100644 --- a/openmp/runtime/src/kmp_affinity.cpp +++ b/openmp/runtime/src/kmp_affinity.cpp @@ -1892,7 +1892,7 @@ static int __kmp_affinity_create_cpuinfo_map(AddrUnsPair **address2os, continue; } unsigned level; - if (KMP_SSCANF(buf, "node_%d id", &level) == 1) { + if (KMP_SSCANF(buf, "node_%u id", &level) == 1) { CHECK_LINE; char *p = strchr(buf + sizeof(s4) - 1, ':'); unsigned val; @@ -4038,12 +4038,11 @@ static void __kmp_aux_affinity_initialize(void) { if (f == NULL) { int code = errno; if (__kmp_cpuinfo_file != NULL) { - __kmp_msg(kmp_ms_fatal, KMP_MSG(CantOpenFileForReading, filename), - KMP_ERR(code), KMP_HNT(NameComesFrom_CPUINFO_FILE), - __kmp_msg_null); + __kmp_fatal(KMP_MSG(CantOpenFileForReading, filename), KMP_ERR(code), + KMP_HNT(NameComesFrom_CPUINFO_FILE), __kmp_msg_null); } else { - __kmp_msg(kmp_ms_fatal, KMP_MSG(CantOpenFileForReading, filename), - KMP_ERR(code), __kmp_msg_null); + __kmp_fatal(KMP_MSG(CantOpenFileForReading, filename), KMP_ERR(code), + __kmp_msg_null); } } int line = 0; |
