BRL-CAD/stepcode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused variables in clstepcore

Browse Source
This commit is contained in:
Mark Pictor
2011-07-31 23:31:06 +02:00
committed by tpaviot
parent fcf02599b8
commit 7a68580976
8 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/clstepcore/ExpDict.cc
-6
View File
@@ -836,7 +836,6 @@ AttrDescriptor::ExpandedTypeName(SCLstring & s) const
const char *
AttrDescriptor::GenerateExpress (SCLstring &buf) const
{
char tmp[BUFSIZ];
SCLstring sstr;
buf = AttrExprDefStr(sstr);
buf.Append(";\n");
@@ -957,7 +956,6 @@ EnumTypeDescriptor::GenerateExpress (SCLstring &buf) const
const char *desc = Description();
const char *ptr = &(desc[16]);
int count;
Where_rule_ptr wr;
int i;
int all_comments = 1;
@@ -1060,10 +1058,8 @@ EntityDescriptor::~EntityDescriptor ()
const char *
EntityDescriptor::GenerateExpress (SCLstring &buf) const
{
char tmp[BUFSIZ];
SCLstring sstr;
int count;
Where_rule_ptr wr;
int i;
int all_comments = 1;
@@ -1683,7 +1679,6 @@ TypeDescriptor::GenerateExpress (SCLstring &buf) const
const char *desc = Description();
const char *ptr = desc;
int count;
Where_rule_ptr wr;
int i;
int all_comments = 1;
@@ -2093,7 +2088,6 @@ SelectTypeDescriptor::CanBe (const TypeDescriptor * other) const
const TypeDescriptor *
SelectTypeDescriptor::CanBe (const char * other) const
{
const TypeDescriptor * found =0;
TypeDescItr elements (GetElements()) ;
const TypeDescriptor * td =0;
src/clstepcore/STEPaggregate.cc
-7
View File
@@ -116,7 +116,6 @@ STEPaggregate::ReadValue(istream &in, ErrorDescriptor *err,
Empty (); // read new values and discard existing ones
char c;
int validDelims = 1;
in >> ws; // skip white space
@@ -132,7 +131,6 @@ STEPaggregate::ReadValue(istream &in, ErrorDescriptor *err,
if(c == '(')
{
in.get(c);
validDelims = 0; // signal expectation for end paren delim
}
else if(exchangeFileFormat)
{ // error did not find opening delim
@@ -593,7 +591,6 @@ EntityAggregate::ReadValue(istream &in, ErrorDescriptor *err,
Empty (); // read new values and discard existing ones
char c;
int validDelims = 1;
in >> ws; // skip white space
@@ -609,7 +606,6 @@ EntityAggregate::ReadValue(istream &in, ErrorDescriptor *err,
if(c == '(')
{
in.get(c);
validDelims = 0; // signal expectation for end delim
}
else if(exchangeFileFormat)
{ // error did not find opening delim
@@ -916,7 +912,6 @@ SelectAggregate::ReadValue(istream &in, ErrorDescriptor *err,
Empty (); // read new values and discard existing ones
char c;
int validDelims = 1;
in >> ws; // skip white space
@@ -932,7 +927,6 @@ SelectAggregate::ReadValue(istream &in, ErrorDescriptor *err,
if(c == '(')
{
in.get(c);
validDelims = 0; // signal expectation for end delim
}
else if(exchangeFileFormat)
{ // error did not find opening delim
@@ -1980,7 +1974,6 @@ RealNode::asStr(SCLstring &s)
const char *
RealNode::STEPwrite(SCLstring &s, const char *)
{
char tmp[BUFSIZ];
if(value != S_REAL_NULL)
{
// sprintf(tmp, "%.15g", value);
src/clstepcore/STEPattribute.cc
+6 -7
View File
@@ -109,24 +109,23 @@ STEPattribute::StrToVal (const char* s, InstMgr * instances, int addFileId)
}
istringstream in ((char *)s); // sz defaults to length of s
int valAssigned = 0;
// read in value for attribute
switch (NonRefType())
{
case INTEGER_TYPE:
{
valAssigned = ReadInteger(*(ptr.i), s, &_error, 0);
ReadInteger(*(ptr.i), s, &_error, 0);
break;
}
case REAL_TYPE:
{
valAssigned = ReadReal(*(ptr.r), s, &_error, 0);
ReadReal(*(ptr.r), s, &_error, 0);
break;
}
case NUMBER_TYPE:
{
valAssigned = ReadNumber(*(ptr.r), s, &_error, 0);
ReadNumber(*(ptr.r), s, &_error, 0);
break;
}
@@ -325,17 +324,17 @@ STEPattribute::STEPread (istream& in, InstMgr * instances, int addFileId,
{
case INTEGER_TYPE:
{
int valAssigned = ReadInteger(*(ptr.i), in, &_error, ",)");
ReadInteger(*(ptr.i), in, &_error, ",)");
return _error.severity();
}
case REAL_TYPE:
{
int valAssigned = ReadReal(*(ptr.r), in, &_error, ",)");
ReadReal(*(ptr.r), in, &_error, ",)");
return _error.severity();
}
case NUMBER_TYPE:
{
int valAssigned = ReadNumber(*(ptr.r), in, &_error, ",)");
ReadNumber(*(ptr.r), in, &_error, ",)");
return _error.severity();
}
case STRING_TYPE:
src/clstepcore/STEPcomplex.cc
-4
View File
@@ -25,7 +25,6 @@ STEPcomplex::STEPcomplex(Registry *registry, const SCLstring **names,
: SCLP23(Application_instance)(fileid, 1), sc(0), head(this), _registry(registry), visited(0)
{
char *nms[BUFSIZ];
SCLstring *name;
int j, k;
// Create a char ** list of names and call Initialize to build all:
@@ -161,7 +160,6 @@ STEPcomplex::~STEPcomplex()
void
STEPcomplex::AssignDerives()
{
const char *nm;
STEPattribute * a = 0;
STEPcomplex *scomp1 = head;
STEPcomplex *scomp2;
@@ -479,7 +477,6 @@ STEPcomplex::BuildAttrs(const char *s )
//////////////////////////////////////////////
// find out how many attrs there are
//////////////////////////////////////////////
int attrCount = attrList->EntryCount();
STEPattribute * a = 0;
@@ -660,7 +657,6 @@ STEPcomplex::WriteExtMapEntities(ostream& out, const char *currSch)
const char *
STEPcomplex::WriteExtMapEntities(SCLstring &buf, const char *currSch)
{
char instanceInfo[BUFSIZ];
SCLstring tmp;
// sprintf(instanceInfo, "%s(", (char *)StrToUpper( EntityName(), tmp ) );
src/clstepcore/orlist.cc
-1
View File
@@ -50,7 +50,6 @@ void OrList::unmarkAll( EntNode *ents )
*/
{
EntList *child;
int j;
if ( (child = getChild( choice )) != NULL ) {
// choice = the last selected path which we'll now undo.
src/clstepcore/read_func.cc
+3 -4
View File
@@ -94,7 +94,7 @@ ReadInteger(SCLP23(Integer) &val, istream &in, ErrorDescriptor *err,
valAssigned = 1;
val = i;
}
Severity s = CheckRemainingInput(in, err, "Integer", tokenList);
CheckRemainingInput(in, err, "Integer", tokenList);
return valAssigned;
}
@@ -399,7 +399,7 @@ ReadReal(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
else
val = S_REAL_NULL;
Severity s = CheckRemainingInput(in, err, "Real", tokenList);
CheckRemainingInput(in, err, "Real", tokenList);
return valAssigned;
/* old way - much easier but not thorough enough */
@@ -522,7 +522,7 @@ ReadNumber(SCLP23(Real) &val, istream &in, ErrorDescriptor *err,
valAssigned = 1;
val = d;
}
Severity s = CheckRemainingInput(in, err, "Number", tokenList);
CheckRemainingInput(in, err, "Number", tokenList);
return valAssigned;
}
@@ -1180,7 +1180,6 @@ ReadTokenSeparator(istream& in, SCLstring *comments)
{
char c;
SCLstring s; // used if need to read a comment
const char *cstr = 0;
if (in.eof())
{
src/clstepcore/sdaiApplication_instance.cc
-1
View File
@@ -901,7 +901,6 @@ ReadEntityRef(istream &in, ErrorDescriptor *err, const char* tokenList,
case '#':
{
int id = -1;
int n = 0;
in >> id;
if (in.fail ()) // there's been an error in input
{
src/clstepcore/sdaiEnum.cc
+2 -2
View File
@@ -726,7 +726,7 @@ SCLP23(Enum)::StrToVal (const char * s, ErrorDescriptor *err, int optional)
{
istringstream in ((char *)s); // sz defaults to length of s
Severity sev = ReadEnum(in, err, 1, 0);
ReadEnum(in, err, 1, 0);
if( (err->severity() == SEVERITY_INCOMPLETE) && optional)
err->severity(SEVERITY_NULL);
@@ -745,7 +745,7 @@ SCLP23(Enum)::STEPread (const char *s, ErrorDescriptor *err, int optional)
Severity
SCLP23(Enum)::STEPread (istream& in, ErrorDescriptor *err, int optional)
{
Severity sev = ReadEnum(in, err, 1, 1);
ReadEnum(in, err, 1, 1);
if( (err->severity() == SEVERITY_INCOMPLETE) && optional)
err->severity(SEVERITY_NULL);