Feature 1855 sonarqube fix strlen & strcpy

met/src/basic/enum_to_string/my_enum_scanner.cc

@@ -432,7 +432,7 @@ int do_id()
 
 {
 
-// column += strlen(yytext);
+// column += m_strlen(yytext);
 
 if ( enum_mode || last_was_enum || last_was_class )  {
 
@@ -456,7 +456,7 @@ int do_int()
 
 {
 
-// column += strlen(yytext);
+// column += m_strlen(yytext);
 
 if ( !enum_mode )  return ( 0 );
 

met/src/basic/vx_config/config_util.cc

@@ -18,6 +18,7 @@ using namespace std;
 
 #include "vx_math.h"
 #include "vx_util.h"
+#include "string_fxns.h"
 
 #include "GridTemplate.h"
 
@@ -2343,8 +2344,9 @@ const char * statlinetype_to_string(const STATLineType t) {
 ///////////////////////////////////////////////////////////////////////////////
 
 void statlinetype_to_string(const STATLineType t, char *out) {
+   const char *method_name = "statlinetype_to_string() -> ";
 
-   strcpy(out, statlinetype_to_string(t));
+   m_strcpy(out, statlinetype_to_string(t), method_name);
 
    return;
 }

met/src/basic/vx_config/icode.cc

@@ -29,6 +29,7 @@ using namespace std;
 #include "indent.h"
 #include "icode.h"
 #include "dictionary.h"
+#include "string_fxns.h"
 
 #include "celltype_to_string.h"
 
@@ -162,6 +163,8 @@ void IcodeCell::assign(const IcodeCell & icc)
 
 {
 
+const char *method_name = "IcodeCell::assign() -> ";
+
 i = icc.i;
 
 d = icc.d;
@@ -170,17 +173,17 @@ type = icc.type;
 
 if ( type == identifier )  {
 
-   name = new char [1 + strlen(icc.name)];
+   name = new char [1 + m_strlen(icc.name)];
 
-   strcpy(name, icc.name);
+   m_strcpy(name, icc.name, method_name, "name");
 
 }
 
 if ( type == character_string )  {
 
-   text = new char [1 + strlen(icc.text)];
+   text = new char [1 + m_strlen(icc.text)];
 
-   strcpy(text, icc.text);
+   m_strcpy(text, icc.text, method_name, "text");
 
 }
 
@@ -413,13 +416,15 @@ void IcodeCell::set_identifier(const char * Text)
 
 {
 
+const char *method_name = "IcodeCell::set_identifier() -> ";
+
 clear();
 
 type = identifier;
 
-name = new char [1 + strlen(Text)];
+name = new char [1 + m_strlen(Text)];
 
-strcpy(name, Text);
+m_strcpy(name, Text, method_name);
 
 
 return;
@@ -434,15 +439,17 @@ void IcodeCell::set_string(const char * Text)
 
 {
 
+const char *method_name = "IcodeCell::set_string() -> ";
+
 clear();
 
-const int n = strlen(Text);
+const int n = m_strlen(Text);
 
 type = character_string;
 
 text = new char [1 + n];
 
-strcpy(text, Text);
+m_strcpy(text, Text, method_name);
 
 text[n] = 0;
 

met/src/basic/vx_config/my_config_scanner.cc

@@ -26,6 +26,7 @@ using namespace std;
 #include "math_constants.h"
 #include "util_constants.h"
 #include "is_number.h"
+#include "string_fxns.h"
 
 #include "dictionary.h"
 #include "builtin.h"
@@ -527,7 +528,7 @@ int do_id()
 
 int j, k;
 
-Column += strlen(configtext);
+Column += m_strlen(configtext);
 
 if ( is_lhs )  { strncpy(configlval.text, configtext, max_id_length);  return ( IDENTIFIER );  }
 
@@ -657,7 +658,7 @@ int do_int()
 
 {
 
-// Column += strlen(configtext);
+// Column += m_strlen(configtext);
 
 configlval.nval.i = atoi(configtext);
 
@@ -678,7 +679,7 @@ bool do_float()
 
 {
 
-// Column += strlen(configtext);
+// Column += m_strlen(configtext);
 
 configlval.nval.d = atof(configtext);
 
@@ -1113,7 +1114,7 @@ int do_comp()
 
 int return_value = 0;
 
-Column += strlen(configtext);
+Column += m_strlen(configtext);
 
      if ( strcmp(configtext, "<" ) == 0 )  { configlval.cval = thresh_lt;  return_value = COMPARISON; }
 else if ( strcmp(configtext, ">" ) == 0 )  { configlval.cval = thresh_gt;  return_value = COMPARISON; }

met/src/basic/vx_log/concat_string.cc

@@ -236,6 +236,7 @@ void ConcatString::assign(const ConcatString & c)
 
    memcpy(FloatFormat, c.FloatFormat, sizeof(FloatFormat));
    Precision = c.Precision;
+   AllocInc = c.AllocInc;
 }
 
 

met/src/basic/vx_util/ascii_table.cc

@@ -26,6 +26,7 @@ using namespace std;
 #include "ascii_table.h"
 #include "comma_string.h"
 #include "fix_float.h"
+#include "string_fxns.h"
 #include "util_constants.h"
 
 ////////////////////////////////////////////////////////////////////////
@@ -1319,6 +1320,13 @@ if ( Nrows < 0 || Nrows >= INT_MAX )  {
    exit ( 1 );
 }
 
+   //
+   // Line up the decimals in the data starting in row 2.
+   // For two or fewer rows, there is no work to do.
+   //
+
+if ( Nrows <= 2 )  return;
+
 int left[Nrows];
 int right[Nrows];
 
@@ -1327,23 +1335,24 @@ int max_left, max_right;
 const char fill_char = ' ';
 const int r_start = 1;   //  skip the header row
 
+
+for (r=0; r<r_start; ++r)  {
+
+   left[r] = right[r] = 0;
+
+}
+
 for (c=0; c<Ncols; ++c)  {
 
       //  get the pad size for that column
 
+   max_left = max_right = -5;  // negative value as the minimum offset of the text
+
    for (r=r_start; r<Nrows; ++r)  {
 
       n = rc_to_n(r, c);
 
       n_figures(e[n], left[r], right[r]);
-
-   }
-
-   max_left  = left  [r_start];
-   max_right = right [r_start];
-
-   for (r=r_start+1; r<Nrows; ++r)  {
-
       if ( left  [r] > max_left  )  max_left  =  left[r];
       if ( right [r] > max_right )  max_right = right[r];
 
@@ -1525,7 +1534,7 @@ out[field_width] = (char) 0;   //  end-of-string marker
 
 if ( !text )  return;
 
-len = strlen(text);
+len = m_strlen(text);
 
 if ( len == 0 )  return;
 

met/src/basic/vx_util/command_line.cc

@@ -730,7 +730,7 @@ for (j=0; j<N; ++j)  {
          //
 
       if ( (args[j].compare(verbosity_option) == 0) ||
-           (args[j].compare(log_option)       == 0) )  continue;      
+           (args[j].compare(log_option)       == 0) )  continue;
 
       option_index = options.lookup(args[j]);
 
@@ -750,8 +750,6 @@ for (j=0; j<N; ++j)  {
 
       }
 
-      return ( j );
-
    }
 
 }   //  for j

met/src/basic/vx_util/filename_suffix.cc

@@ -42,7 +42,7 @@ const char * f = get_short_name(filename);   //  to avoid things like "./foo"
    //  start at the end of the filename
    //
 
-const char * s = f + (strlen(f) - 1);
+const char * s = f + (m_strlen(f) - 1);
 
    //
    //  move left until we see a period

met/src/basic/vx_util/is_number.cc

@@ -21,6 +21,7 @@ using namespace std;
 #include <cmath>
 
 #include "is_number.h"
+#include "string_fxns.h"
 #include "substring.h"
 
 
@@ -46,7 +47,7 @@ static int is_allowed_float_char(const char c);
 
 static const char allowed_float_chars [] = "+-Ee.0123456789";
 
-static const int n_allowed_float_chars = strlen(allowed_float_chars);
+static const int n_allowed_float_chars = m_strlen(allowed_float_chars);
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -112,7 +113,7 @@ int is_float(const char * text)
 
 if ( !text )  return ( 0 );
 
-const int n = strlen(text);
+const int n = m_strlen(text);
 
 if ( n == 0 )  return ( 0 );
 
@@ -184,7 +185,7 @@ if ( is_sign_char(t[0]) )  ++t;
    //  at most one decimal point
    //
 
-n = strlen(t);
+n = m_strlen(t);
 
 digit_count = dp_count = 0;
 
@@ -226,7 +227,7 @@ char junk[128];
    //  if the "e" is the first or last character, return "no"
    //
 
-n = strlen(text);
+n = m_strlen(text);
 
 if ( (exp_pos == 0) || (exp_pos == (n - 1)) )  return ( 0 );
 

met/src/basic/vx_util/make_path.cc

@@ -26,6 +26,7 @@ using namespace std;
 
 #include "make_path.h"
 #include "vx_log.h"
+#include "string_fxns.h"
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -46,40 +47,40 @@ if ( path_exists(path) )  return ( 1 );
 
 int j;
 int status;
-char subpath[PATH_MAX];
+const char *method_name = "make_path() ";
 
 
-memset(subpath, 0, sizeof(subpath));
-
    //
    //  make subpath
    //
 
-strcpy(subpath, path);
-
-j = strlen(subpath) - 1;
-
-while ( (j >= 0) && (subpath[j] != '/') )  subpath[j--] = (char) 0;
+char *subpath = m_strcpy2(path, method_name);
 
-if ( j >= 0 )   subpath[j] = (char) 0;
+if (subpath) {
+   j = m_strlen(subpath) - 1;
 
-mlog << Debug(1) << "\n\n  subpath = \"" << subpath << "\"\n\n";
+   while ( (j >= 0) && (subpath[j] != '/') )  subpath[j--] = (char) 0;
 
-if ( strlen(subpath) == 0 )   return ( 0 );
+   if ( j >= 0 ) subpath[j] = (char) 0;
 
+   mlog << Debug(1) << "\n\n  " << method_name << "subpath = \"" << subpath << "\"\n\n";
 
+   if ( m_strlen(subpath) == 0 ) {
+      if (subpath) { delete [] subpath; subpath = (char *) 0; }
+      return ( 0 );
+   }
 
-if ( !(path_exists(subpath)) )  {
-
-   make_path(subpath, mode);
+   if ( !(path_exists(subpath)) )  {
+      make_path(subpath, mode);
+   }
 
 }
 
-
 status = mkdir(path, mode);
 
-if ( status < 0 )   return ( 0 );
+if (subpath) { delete [] subpath; subpath = (char *) 0; }
 
+if ( status < 0 )   return ( 0 );
 
 return ( 1 );