Two warning messages fixed.

llvm-svn: 230035

diff --git a/openmp/runtime/src/i18n/en_US.txt b/openmp/runtime/src/i18n/en_US.txt
index ca961a7..d3da386 100644 (file)
--- a/openmp/runtime/src/i18n/en_US.txt
+++ b/openmp/runtime/src/i18n/en_US.txt
@@ -322,8 +322,8 @@ BarriersInDifferentOrder     "Threads encountered barriers in different order. "
 FunctionError                "Function %1$s failed:"
 TopologyExtra                "%1$s: %2$s packages x %3$d cores/pkg x %4$d threads/core (%5$d total cores)"
 WrongMessageCatalog          "Incompatible message catalog \"%1$s\": Version \"%2$s\" found, version \"%3$s\" expected."
-StgIgnored                   "%1$s: ignored because %3$s has been defined"
-                                 # %1, %2 -- name and value of ignored variable, %3 -- name of variable with higher priority.
+StgIgnored                   "%1$s: ignored because %2$s has been defined"
+                                 # %1, -- name of ignored variable, %2 -- name of variable with higher priority.
 OBSOLETE                     "%1$s: overrides %3$s specified before"
                                  # %1, %2 -- name and value of the overriding variable, %3 -- name of overriden variable.
 
@@ -367,8 +367,8 @@ IncompatibleLibrary          "Incompatible %1$s library with version %2$s found.
 IttFunctionError             "ittnotify: Function %1$s failed:"
 IttUnknownError              "ittnofify: Error #%1$d."
 EnvMiddleWarn                "%1$s must be set prior to first parallel region or certain API calls; ignored."
-CnsLockNotDestroyed          "Lock initialized at %1$s(%3$d) was not destroyed"
-                                 # %1, %2, %3, %4 -- file, func, line, col
+CnsLockNotDestroyed          "Lock initialized at %1$s(%2$d) was not destroyed"
+                                 # %1, %2, %3, %4 -- file, line, func, col
 CantLoadBalUsing             "Cannot determine machine load balance - Using %1$s"
 AffNotCapableUsePthread      "%1$s: Affinity not capable, using pthread info"
 AffUsePthread                "%1$s: Affinity capable, using pthread info"

diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp
index 0a0e9d1..4fb7c93 100644 (file)
--- a/openmp/runtime/src/kmp_lock.cpp
+++ b/openmp/runtime/src/kmp_lock.cpp
@@ -4043,8 +4043,7 @@ __kmp_cleanup_user_locks( void )
               ( ( loc = __kmp_get_user_lock_location( lck ) ) != NULL ) &&
               ( loc->psource != NULL ) ) {
                 kmp_str_loc_t str_loc = __kmp_str_loc_init( loc->psource, 0 );
-                KMP_WARNING( CnsLockNotDestroyed, str_loc.file, str_loc.func,
-                  str_loc.line, str_loc.col );
+                KMP_WARNING( CnsLockNotDestroyed, str_loc.file, str_loc.line );
                 __kmp_str_loc_free( &str_loc);
             }
 

diff --git a/openmp/runtime/src/kmp_settings.c b/openmp/runtime/src/kmp_settings.c
index 0394afd..b6928d4 100644 (file)
--- a/openmp/runtime/src/kmp_settings.c
+++ b/openmp/runtime/src/kmp_settings.c
@@ -4862,7 +4862,7 @@ __kmp_stg_check_rivals(          // 0 -- Ok, 1 -- errors found.
 #endif
 
         if ( rivals[ i ]->set ) {
-            KMP_WARNING( StgIgnored, name, value, rivals[ i ]->name );
+            KMP_WARNING( StgIgnored, name, rivals[ i ]->name );
             return 1;
         }; // if
     }; // while