Clear some C++ compilation warnings from the main stepcode libs

starseeker · starseeker · commit f8783577d5cb · 2020-12-14T12:58:49.000-05:00
diff --git a/src/base/judy/src/judy.c b/src/base/judy/src/judy.c
@@ -1097,7 +1097,7 @@ JudySlot *judy_prv(Judy *judy)
 
 JudySlot *judy_del(Judy *judy)
 {
-    int slot, off, size, type, high;
+    int slot, off, size, type;
     JudySlot *table, *inner;
     JudySlot next, *node;
     int keysize, cnt;
@@ -1150,7 +1150,6 @@ JudySlot *judy_del(Judy *judy)
                 table = (JudySlot *)(next & JUDY_mask);
                 inner = (JudySlot *)(table[slot >> 4] & JUDY_mask);
                 inner[slot & 0x0F] = 0;
-                high = slot & 0xF0;
 
                 for(cnt = 16; cnt--;)
                     if(inner[cnt]) {
diff --git a/src/cldai/sdaiEntity_extent.cc b/src/cldai/sdaiEntity_extent.cc
@@ -63,7 +63,7 @@ void SDAI_Entity_extent::owned_by_(SDAI_Model_contents__list_var &mclv)
 
 SDAI_Model_contents__list_var SDAI_Entity_extent ::owned_by_() const
 {
-    return (const SDAI_Model_contents__list_var) &_owned_by;
+    return (SDAI_Model_contents__list_var) &_owned_by;
 }
 
 /*
diff --git a/src/cldai/sdaiEntity_extent.h b/src/cldai/sdaiEntity_extent.h
@@ -60,7 +60,7 @@ class SC_DAI_EXPORT SDAI_Entity_extent : public SDAI_Session_instance
         }
         SDAI_DAObject__set_var instances_() const
         {
-            return (const SDAI_DAObject__set_var)&_instances;
+            return (SDAI_DAObject__set_var)&_instances;
         }
 
 // need to implement Model_contents__list
diff --git a/src/cldai/sdaiModel_contents.cc b/src/cldai/sdaiModel_contents.cc
@@ -33,7 +33,7 @@ SDAI_Model_contents::instances_()
 SDAI_Model_contents_instances_ptr
 SDAI_Model_contents::instances_() const
 {
-    return (const SDAI_Model_contents_instances_ptr) &_instances;
+    return (SDAI_Model_contents_instances_ptr) &_instances;
 }
 
 SDAI_Entity_extent__set_var
@@ -45,7 +45,7 @@ SDAI_Model_contents::folders_()
 SDAI_Entity_extent__set_var
 SDAI_Model_contents::folders_() const
 {
-    return (const SDAI_Entity_extent__set_var)&_folders;
+    return (SDAI_Entity_extent__set_var)&_folders;
 }
 
 SDAI_Entity_extent__set_var
@@ -57,7 +57,7 @@ SDAI_Model_contents::populated_folders_()
 SDAI_Entity_extent__set_var
 SDAI_Model_contents::populated_folders_() const
 {
-    return (const SDAI_Entity_extent__set_var)&_populated_folders;
+    return (SDAI_Entity_extent__set_var)&_populated_folders;
 }
 
 SDAI_PID_DA_ptr SDAI_Model_contents::get_object_pid(const SDAI_DAObject_ptr &d) const
diff --git a/src/cldai/sdaiModel_contents.h b/src/cldai/sdaiModel_contents.h
@@ -43,7 +43,7 @@ class SC_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject
         }
         SDAI_DAObject__set_var contents_() const
         {
-            return (const SDAI_DAObject__set_var) &_instances;
+            return (SDAI_DAObject__set_var) &_instances;
         }
 
 };
diff --git a/src/cldai/sdaiString.cc b/src/cldai/sdaiString.cc
@@ -46,6 +46,12 @@ SDAI_String &SDAI_String::operator= (const char *s)
     return *this;
 }
 
+SDAI_String &SDAI_String::operator= (const SDAI_String &s)
+{
+    content = s.content;
+    return *this;
+}
+
 bool SDAI_String::operator== (const char *s) const
 {
     return (content == s);
diff --git a/src/cldai/sdaiString.h b/src/cldai/sdaiString.h
@@ -12,6 +12,7 @@
 */
 
 #include <sc_export.h>
+#include <string>
 #include <limits>
 
 
@@ -37,6 +38,7 @@ class SC_DAI_EXPORT SDAI_String
 
 //  operators
         SDAI_String &operator= (const char *s);
+        SDAI_String &operator= (const SDAI_String &s);
         bool operator== (const char *s) const;
 
         void clear(void);
diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc
@@ -1498,6 +1498,7 @@ STEPattribute::~STEPattribute()
                     delete(SDAI_BOOLEAN *) ptr.e;
                     ptr.e = 0;
                 }
+                break;
             case LOGICAL_TYPE:
                 if(ptr.e) {
                     delete(SDAI_LOGICAL *) ptr.e;
diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h
@@ -98,14 +98,17 @@ class SC_CORE_EXPORT STEPattribute
             void *p;
         } ptr;
 
-        const AttrDescriptor *aDesc;
 
     protected:
         bool _derive;
         bool _mustDeletePtr; ///if a member uses new to create an object in ptr
         ErrorDescriptor _error;
         STEPattribute *_redefAttr;
-        int refCount;
+    public:
+	const AttrDescriptor *aDesc;
+
+    protected:
+	int refCount;
 
         char SkipBadAttr(istream &in, char *StopChars);
         void AddErrorInfo();
diff --git a/src/clstepcore/globalRule.h b/src/clstepcore/globalRule.h
@@ -15,14 +15,14 @@ class SC_CORE_EXPORT Global_rule : public Dictionary_instance
 #pragma warning( disable: 4251 )
 #endif
         Express_id _name;
-        std::string _rule_text; // non-SDAI
 #ifdef _MSC_VER
 #pragma warning( pop )
 #endif
 
         Entity__set_var _entities; // not implemented
         Where_rule__list_var _where_rules;
         Schema_ptr _parent_schema;
+        std::string _rule_text; // non-SDAI
 
         Global_rule();
         Global_rule(const char *n, Schema_ptr parent_sch, const std::string &rt);
diff --git a/src/clstepcore/interfaceSpec.h b/src/clstepcore/interfaceSpec.h
@@ -15,7 +15,17 @@ class SC_CORE_EXPORT Interface_spec : public Dictionary_instance
 #pragma warning( disable: 4251 )
 #endif
         Express_id _current_schema_id; // schema containing the USE/REF stmt
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+        // set of objects from USE/REFERENCE stmt(s)
+        Explicit_item_id__set_var _explicit_items;
+        Implicit_item_id__set_var _implicit_items; //not yet initialized for schema
 
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable: 4251 )
+#endif
         // non-SDAI, not useful for SDAI use of Interface_spec (it would need to
         // be a list).
         // schema that defined the USE/REFd objects
@@ -24,10 +34,6 @@ class SC_CORE_EXPORT Interface_spec : public Dictionary_instance
 #pragma warning( pop )
 #endif
 
-        // set of objects from USE/REFERENCE stmt(s)
-        Explicit_item_id__set_var _explicit_items;
-        Implicit_item_id__set_var _implicit_items; //not yet initialized for schema
-
         // non-SDAI, not useful for SDAI use of Interface_spec (it would need to
         // be a list of ints).
         // schema USEs or REFERENCEs all objects from foreign schema
diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc
@@ -706,6 +706,7 @@ SDAI_Application_instance *ReadEntityRef(istream &in, ErrorDescriptor *err, cons
             err->AppendToDetailMsg("Use of @ instead of # to identify entity.\n");
             err->GreaterSeverity(SEVERITY_WARNING);
         // no break statement here on purpose
+	    [[gnu::fallthrough]];
         case '#': {
             int id = -1;
             in >>  id;
@@ -914,9 +915,12 @@ Severity EntityValidLevel(const char *attrValue,   // string contain entity ref
 
     if((found1 > 0) || (found2 > 0)) {
         if((found1 == 2) || (found2 == 2)) {
-            sprintf(messageBuf,
+            int ocnt = snprintf(messageBuf, BUFSIZ,
                     " Attribute's Entity Reference %s is %s data \'%s\'.\n",
                     attrValue, "followed by invalid", tmp);
+	    if (ocnt < BUFSIZ) {
+		    fprintf(stderr, "Warning - truncation of Attribute's Entry Reference msg\n");
+	    }
             err->AppendToUserMsg(messageBuf);
             err->AppendToDetailMsg(messageBuf);
             err->GreaterSeverity(SEVERITY_WARNING);
diff --git a/src/clutils/sc_hash.cc b/src/clutils/sc_hash.cc
@@ -65,7 +65,7 @@ void SC_HASHinsert(Hash_TableP t, char *s, void *data)
     e.symbol = 0;
     e2 = SC_HASHsearch(t, &e, HASH_INSERT);
     if(e2) {
-        fprintf(stderr, "%s: Redeclaration of %s\n", __FUNCTION__, s);
+        fprintf(stderr, "%s: Redeclaration of %s\n", __func__, s);
     }
 }
 
diff --git a/src/exp2cxx/classes_type.c b/src/exp2cxx/classes_type.c
@@ -124,7 +124,7 @@ char *CheckEnumSymbol(char *s)
     } else {
         strcpy(b, s);
         strcat(b, "_");
-        fprintf(stderr, "Warning in %s: the enumerated value %s is already being used and has been changed to %s\n", __FUNCTION__, s, b);
+        fprintf(stderr, "Warning in %s: the enumerated value %s is already being used and has been changed to %s\n", __func__, s, b);
         return (b);
     }
 }
@@ -1313,7 +1313,7 @@ char *TYPEget_express_type(const Type t)
 
     /*  default returns undefined   */
 
-    fprintf(stderr, "Warning in %s: type %s is undefined\n", __FUNCTION__, TYPEget_name(t));
+    fprintf(stderr, "Warning in %s: type %s is undefined\n", __func__, TYPEget_name(t));
     return ("SCLundefined");
 
 }
diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc
@@ -405,6 +405,7 @@ void INITFileFinish(FILE *initfile, Schema schema)
  ******************************************************************/
 void SCHEMAprint(Schema schema, FILES *files, void *complexCol, int suffix)
 {
+    int ocnt = 0;
     char schnm[MAX_LEN], sufnm[MAX_LEN], fnm[MAX_LEN], *np;
     /* sufnm = schema name + suffix */
     FILE *libfile,
@@ -422,11 +423,20 @@ void SCHEMAprint(Schema schema, FILES *files, void *complexCol, int suffix)
     /*  1.  header file             */
     sprintf(schnm, "%s%s", SCHEMA_FILE_PREFIX, StrToUpper(SCHEMAget_name(schema)));       //TODO change file names to CamelCase?
     if(suffix == 0) {
-        sprintf(sufnm, "%s", schnm);
+        ocnt = snprintf(sufnm, MAX_LEN, "%s", schnm);
+	if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper.cc line 425 - sufnm not large enough to hold schnm\n";
+	}
     } else {
-        sprintf(sufnm, "%s_%d", schnm, suffix);
+        ocnt = snprintf(sufnm, MAX_LEN, "%s_%d", schnm, suffix);
+	if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper.cc line 430 - sufnm not large enough to hold string\n";
+	}
+    }
+    ocnt = snprintf(fnm, MAX_LEN, "%s.h", sufnm);
+    if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper.cc line 436 - sufnm not large enough to hold string\n";
     }
-    sprintf(fnm, "%s.h", sufnm);
 
     if(!(incfile = (files -> inc) = FILEcreate(fnm))) {
         return;
@@ -467,7 +477,11 @@ void SCHEMAprint(Schema schema, FILES *files, void *complexCol, int suffix)
     fprintf(libfile, "\n#include \"%s.h\"\n", schnm);
 
     // 3. header for namespace to contain all formerly-global variables
-    sprintf(fnm, "%sNames.h", schnm);
+    ocnt = snprintf(fnm, MAX_LEN, "%sNames.h", schnm);
+    if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper.cc line 480 - fnm not large enough to hold schnm\n";
+    }
+
     if(!(files->names = FILEcreate(fnm))) {
         return;
     }
@@ -482,7 +496,11 @@ void SCHEMAprint(Schema schema, FILES *files, void *complexCol, int suffix)
 
     if(suffix <= 1) {
         /* I.e., if this is our first pass with schema */
-        sprintf(fnm, "%s.init.cc", schnm);
+        ocnt = snprintf(fnm, MAX_LEN, "%s.init.cc", schnm);
+	if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper.cc line 499 - fnm not large enough to hold string\n";
+	}
+
         /* Note - We use schnm (without the "_x" suffix sufnm has) since we
         ** only generate a single init.cc file. */
         if(!(initfile = (files -> init) = FILEcreate(fnm))) {
@@ -545,8 +563,12 @@ void SCHEMAprint(Schema schema, FILES *files, void *complexCol, int suffix)
         fprintf(files->classes, "\n#include \"%sNames.h\"\n", schnm);
     } else {
         /* Just reopen the .init.cc (in append mode): */
-        sprintf(fnm, "%s.init.cc", schnm);
-        initfile = files->init = fopen(fnm, "a");
+	ocnt = snprintf(fnm, MAX_LEN, "%s.init.cc", schnm);
+	if (ocnt > MAX_LEN) {
+		std::cerr << "Warning - classes_wrapper.cc line 558 - sufnm not large enough to hold string\n";
+	}
+
+	initfile = files->init = fopen(fnm, "a");
     }
 
     /**********  record in files relating to entire input   ***********/
diff --git a/src/exp2python/src/classes_python.c b/src/exp2python/src/classes_python.c
@@ -386,7 +386,7 @@ char *EXPRto_python(Expression e)
 
     buf = (char *)sc_malloc(bufsize);
     if(!buf) {
-        fprintf(stderr, "%s failed to allocate buffer: %s\n", __FUNCTION__, strerror(errno));
+        fprintf(stderr, "%s failed to allocate buffer: %s\n", __func__, strerror(errno));
         abort();
     }
 
@@ -483,7 +483,7 @@ char *EXPRto_python(Expression e)
 
     temp = (char *)sc_realloc(buf, 1 + strlen(buf));
     if(temp == 0) {
-        fprintf(stderr, "%s failed to realloc buffer: %s\n", __FUNCTION__, strerror(errno));
+        fprintf(stderr, "%s failed to realloc buffer: %s\n", __func__, strerror(errno));
         abort();
     }
 
diff --git a/src/exp2python/src/classes_wrapper_python.cc b/src/exp2python/src/classes_wrapper_python.cc
@@ -153,6 +153,7 @@ void SCOPEPrint(Scope scope, FILES *files, Schema schema)
 
 void SCHEMAprint(Schema schema, FILES *files, int suffix)
 {
+    int ocnt = 0;
     char schnm[MAX_LEN], sufnm[MAX_LEN], fnm[MAX_LEN], *np;
     /* sufnm = schema name + suffix */
     FILE *libfile;
@@ -163,9 +164,15 @@ void SCHEMAprint(Schema schema, FILES *files, int suffix)
     if(suffix == 0) {
         sprintf(sufnm, "%s", schnm);
     } else {
-        sprintf(sufnm, "%s_%d", schnm, suffix);
+        ocnt = snprintf(sufnm, MAX_LEN, "%s_%d", schnm, suffix);
+	if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper_python.cc - sufnm not large enough to hold string\n";
+	}
+    }
+    ocnt = snprintf(fnm, MAX_LEN, "%s.h", sufnm);
+    if (ocnt > MAX_LEN) {
+	    std::cerr << "Warning - classes_wrapper_python.cc - fnm not large enough to hold string\n";
     }
-    sprintf(fnm, "%s.h", sufnm);
 
     np = fnm + strlen(fnm) - 1;   /*  point to end of constant part of string  */
 
diff --git a/src/express/expr.c b/src/express/expr.c
@@ -238,7 +238,9 @@ static int EXP_resolve_op_dot_fuzzy(Type selection, Symbol sref, Expression *e,
                 *e = item;
                 *dt = DICT_type;
                 return 1;
-            }
+            } else {
+	        return 0;
+	    }
         default:
             return 0;
     }
@@ -325,8 +327,8 @@ Type EXPresolve_op_dot(Expression expr, Scope scope)
                     } else {
                         fprintf(stderr, "EXPresolved_op_dot: attribute not an attribute?\n");
                         ERRORabort(0);
-                    }
-
+			return(Type_Bad);
+		    }
                 default:
                     /* compile-time ambiguous */
                     if(where) {
@@ -613,11 +615,11 @@ void EXPresolve_op_default(Expression e, Scope s)
 {
     int failed = 0;
 
-    switch(OPget_number_of_operands(e->e.op_code)) {
-        case 3:
+    if (OPget_number_of_operands(e->e.op_code) == 3) {
             EXPresolve(e->e.op3, s, Type_Dont_Care);
             failed = is_resolve_failed(e->e.op3);
-        case 2:
+    }
+    if (OPget_number_of_operands(e->e.op_code) == 2) {
             EXPresolve(e->e.op2, s, Type_Dont_Care);
             failed |= is_resolve_failed(e->e.op2);
     }
diff --git a/src/express/info.c b/src/express/info.c
@@ -28,7 +28,7 @@ void EXPRESSusage(int _exit)
     fprintf(stderr, "\t-i warning ignore\n");
     fprintf(stderr, "and <warning> is one of:\n");
     fprintf(stderr, "\tnone\n\tall\n");
-    fprintf(stderr, ERRORget_warnings_help("\t", "\n"));
+    fprintf(stderr, "%s", ERRORget_warnings_help("\t", "\n"));
     fprintf(stderr, "and <object_type> is one or more of:\n");
     fprintf(stderr, "  e   entity\n");
     fprintf(stderr, "  p   procedure\n");
diff --git a/src/express/stack.h b/src/express/stack.h
@@ -75,12 +75,4 @@ typedef Linked_List Stack;
 /* function prototypes */
 /***********************/
 
-/*******************************/
-/* inline function definitions */
-/*******************************/
-
-#if supports_inline_functions || defined(STACK_C)
-
-#endif /* supports_inline_functions || defined(STACK_C) */
-
 #endif    /*  STACK_H  */

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void SDAI_Entity_extent::owned_by_(SDAI_Model_contents__list_var &mclv)`
`63`	`63`
`64`	`64`	`SDAI_Model_contents__list_var SDAI_Entity_extent ::owned_by_() const`
`65`	`65`	`{`
`66`		`- return (const SDAI_Model_contents__list_var) &_owned_by;`
	`66`	`+ return (SDAI_Model_contents__list_var) &_owned_by;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class SC_DAI_EXPORT SDAI_Entity_extent : public SDAI_Session_instance`
`60`	`60`	`}`
`61`	`61`	`SDAI_DAObject__set_var instances_() const`
`62`	`62`	`{`
`63`		`- return (const SDAI_DAObject__set_var)&_instances;`
	`63`	`+ return (SDAI_DAObject__set_var)&_instances;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`// need to implement Model_contents__list`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ SDAI_Model_contents::instances_()`
`33`	`33`	`SDAI_Model_contents_instances_ptr`
`34`	`34`	`SDAI_Model_contents::instances_() const`
`35`	`35`	`{`
`36`		`- return (const SDAI_Model_contents_instances_ptr) &_instances;`
	`36`	`+ return (SDAI_Model_contents_instances_ptr) &_instances;`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`SDAI_Entity_extent__set_var`
`@@ -45,7 +45,7 @@ SDAI_Model_contents::folders_()`
`45`	`45`	`SDAI_Entity_extent__set_var`
`46`	`46`	`SDAI_Model_contents::folders_() const`
`47`	`47`	`{`
`48`		`- return (const SDAI_Entity_extent__set_var)&_folders;`
	`48`	`+ return (SDAI_Entity_extent__set_var)&_folders;`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`SDAI_Entity_extent__set_var`
`@@ -57,7 +57,7 @@ SDAI_Model_contents::populated_folders_()`
`57`	`57`	`SDAI_Entity_extent__set_var`
`58`	`58`	`SDAI_Model_contents::populated_folders_() const`
`59`	`59`	`{`
`60`		`- return (const SDAI_Entity_extent__set_var)&_populated_folders;`
	`60`	`+ return (SDAI_Entity_extent__set_var)&_populated_folders;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`SDAI_PID_DA_ptr SDAI_Model_contents::get_object_pid(const SDAI_DAObject_ptr &d) const`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class SC_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject`
`43`	`43`	`}`
`44`	`44`	`SDAI_DAObject__set_var contents_() const`
`45`	`45`	`{`
`46`		`- return (const SDAI_DAObject__set_var) &_instances;`
	`46`	`+ return (SDAI_DAObject__set_var) &_instances;`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`};`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,12 @@ SDAI_String &SDAI_String::operator= (const char *s)`
`46`	`46`	`return *this;`
`47`	`47`	`}`
`48`	`48`
	`49`	`+SDAI_String &SDAI_String::operator= (const SDAI_String &s)`
	`50`	`+{`
	`51`	`+ content = s.content;`
	`52`	`+ return *this;`
	`53`	`+}`
	`54`	`+`
`49`	`55`	`bool SDAI_String::operator== (const char *s) const`
`50`	`56`	`{`
`51`	`57`	`return (content == s);`
Original file line number	Diff line number	Diff line change
`@@ -1498,6 +1498,7 @@ STEPattribute::~STEPattribute()`
`1498`	`1498`	`delete(SDAI_BOOLEAN *) ptr.e;`
`1499`	`1499`	`ptr.e = 0;`
`1500`	`1500`	`}`
	`1501`	`+ break;`
`1501`	`1502`	`case LOGICAL_TYPE:`
`1502`	`1503`	`if(ptr.e) {`
`1503`	`1504`	`delete(SDAI_LOGICAL *) ptr.e;`