Per #2277, more consistent formatting of -> in the error messages.

dtcenter · Nov 2, 2022 · 05746d2 · 05746d2
1 parent ca1e748
commit 05746d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/basic/vx_config/config_util.cc b/src/basic/vx_config/config_util.cc
@@ -3127,10 +3127,10 @@ NormalizeType parse_conf_normalize(Dictionary *dict) {
 ///////////////////////////////////////////////////////////////////////////////
 
 void python_compile_error(const char *caller) {
-   ConcatString cs;
-   if(caller) cs << caller << " -> ";
 
-   mlog << Error << "\n" << cs
+   const char *method_name = (0 != caller) ? caller : "python_compile_error() -> ";
+
+   mlog << Error << "\n" << method_name
         << "Support for Python has not been compiled!\n"
         << "To run Python scripts, recompile with the --enable-python option.\n\n";
 

diff --git a/src/libcode/vx_data2d_factory/data2d_factory.cc b/src/libcode/vx_data2d_factory/data2d_factory.cc
@@ -104,7 +104,7 @@ MetPythonDataFile * p = 0;
       case FileType_Python_Numpy:
       case FileType_Python_Xarray:
 
-         python_compile_error("Met2dDataFileFactory::new_met_2d_data_file()");
+         python_compile_error("Met2dDataFileFactory::new_met_2d_data_file() -> ");
 
 #endif
 

diff --git a/src/libcode/vx_data2d_factory/var_info_factory.cc b/src/libcode/vx_data2d_factory/var_info_factory.cc
@@ -96,7 +96,7 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type)
          p = 0;
          break;
 #else
-         python_compile_error("VarInfoFactory::new_var_info()");
+         python_compile_error("VarInfoFactory::new_var_info() -> ");
 #endif
 
       case FileType_NcCF:

diff --git a/src/tools/other/ascii2nc/ascii2nc.cc b/src/tools/other/ascii2nc/ascii2nc.cc
@@ -602,7 +602,7 @@ void set_format(const StringArray & a) {
    }
    #endif
    else if("python" == a[0]) {
-      python_compile_error("set_format()");
+      python_compile_error("set_format() -> ");
    }
    else {
       mlog << Error << "\nset_format() -> "
-Original file line number
+Diff line change
@@ Expand Up / @@ -96,7 +96,7 @@ VarInfo * VarInfoFactory::new_var_info(GrdFileType type) @@
              p = 0;
              break;
     #else
-             python_compile_error("VarInfoFactory::new_var_info()");
+             python_compile_error("VarInfoFactory::new_var_info() -> ");
     #endif
           case FileType_NcCF:
@@ Expand Down @@