From 830616a60b8de5cc6746fc9d51322e19469839d3 Mon Sep 17 00:00:00 2001 From: dpasukhi Date: Sat, 6 Feb 2021 18:43:43 +0300 Subject: [PATCH] 0032119: Coding Rules - eliminate msvc warning C4800 (implicit cast to bool) after fix for 32115 Fixed incorrect comparison and forcing cast --- src/StepFile/step.tab.cxx | 10 +++++----- src/StepFile/step.yacc | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/StepFile/step.tab.cxx b/src/StepFile/step.tab.cxx index 473d65f559..32a8fee759 100644 --- a/src/StepFile/step.tab.cxx +++ b/src/StepFile/step.tab.cxx @@ -1219,13 +1219,13 @@ namespace step { void step::parser::error(const std::string& m) { char newmess[120]; - Standard_Boolean isSyntax = (Standard_Boolean)strncmp(m.c_str(), "syntax error", 13); - if (isSyntax && strlen(m.c_str()) > 13) - sprintf(newmess, "Undefined Parsing: Line %d: %s: %s", scanner->lineno() + 1, "Incorrect syntax", m.c_str() + 14); + Standard_Boolean isSyntax = strncmp(m.c_str(), "syntax error", 12) == 0; + if (isSyntax && m.length() > 13) + Sprintf(newmess, "Undefined Parsing: Line %d: %s: %s", scanner->lineno() + 1, "Incorrect syntax", m.c_str() + 14); else if (isSyntax) - sprintf(newmess, "Undefined Parsing: Line %d: Incorrect syntax", scanner->lineno() + 1); + Sprintf(newmess, "Undefined Parsing: Line %d: Incorrect syntax", scanner->lineno() + 1); else - sprintf(newmess, "Undefined Parsing: Line %d: %s", scanner->lineno() + 1, m.c_str()); + Sprintf(newmess, "Undefined Parsing: Line %d: %s", scanner->lineno() + 1, m.c_str()); StepFile_Interrupt(newmess, Standard_False); diff --git a/src/StepFile/step.yacc b/src/StepFile/step.yacc index de2f1278d9..6b6f72e3cb 100644 --- a/src/StepFile/step.yacc +++ b/src/StepFile/step.yacc @@ -181,13 +181,13 @@ enttype : TYPE void step::parser::error(const std::string& m) { char newmess[120]; - Standard_Boolean isSyntax = (Standard_Boolean)strncmp(m.c_str(), "syntax error", 13); - if (isSyntax && strlen(m.c_str()) > 13) - sprintf(newmess, "Undefined Parsing: Line %d: %s: %s", scanner->lineno() + 1, "Incorrect syntax", m.c_str() + 14); + Standard_Boolean isSyntax = strncmp(m.c_str(), "syntax error", 12) == 0; + if (isSyntax && m.length() > 13) + Sprintf(newmess, "Undefined Parsing: Line %d: %s: %s", scanner->lineno() + 1, "Incorrect syntax", m.c_str() + 14); else if (isSyntax) - sprintf(newmess, "Undefined Parsing: Line %d: Incorrect syntax", scanner->lineno() + 1); + Sprintf(newmess, "Undefined Parsing: Line %d: Incorrect syntax", scanner->lineno() + 1); else - sprintf(newmess, "Undefined Parsing: Line %d: %s", scanner->lineno() + 1, m.c_str()); + Sprintf(newmess, "Undefined Parsing: Line %d: %s", scanner->lineno() + 1, m.c_str()); StepFile_Interrupt(newmess, Standard_False);