Commit 72b69799 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix ident and compile warning

parent a147d903
......@@ -406,7 +406,7 @@ bool testJournal3()
for( int i=0;i<10;i++)
{
if( j.readRow(i,&ji) )
printf("read i=%d j.id=%d\n",i,ji.id);
printf("read i=%d j.id=%ld\n", i, ji.id);
else
printf("read num=%d FAILED!\n",i);
......
......@@ -40,7 +40,7 @@ using namespace UniSetTypes;
// -----------------------------------------------------------------------------
int main( int argc,char* argv[] )
{
if( argc>1 &amp;&amp; strcmp(argv[1],"--help")==0 )
if( argc>1 &amp;&amp; !strcmp(argv[1],"--help") )
{
cout &lt;&lt; "--name name - ID . IOController1." &lt;&lt; endl;
cout &lt;&lt; "--confile fname - . . configure.xml" &lt;&lt; endl;
......@@ -62,7 +62,7 @@ int main( int argc,char* argv[] )
ObjectId ID(DefaultObjectId);
string name = conf->getArgParam("--name","<xsl:value-of select="normalize-space($OID)"/>");
if( !name.empty() )
ID = conf->getObjectID(name);
ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId )
{
......
......@@ -67,7 +67,7 @@ int main( int argc, const char** argv )
string name = conf->getArgParam("--name","<xsl:value-of select="$CLASSNAME"/>");
if( !name.empty() )
{
ID = conf->getObjectID(name);
ID = conf->getObjectID(name);
if( ID == UniSetTypes::DefaultObjectId )
{
cerr &lt;&lt; "(main): '" &lt;&lt; name
......
......@@ -368,7 +368,7 @@ void IOControl::iopoll()
}
bool prior = false;
int i=0;
unsigned int i = 0;
for( IOMap::iterator it=iomap.begin(); it!=iomap.end(); ++it,i++ )
{
if( it->ignore )
......@@ -644,7 +644,7 @@ bool IOControl::check_item( UniXML_iterator& it )
return false;
// field = value
if( !s_fvalue.empty() && it.getProp(s_field)!=s_fvalue )
if( !s_fvalue.empty() && it.getProp(s_field) != s_fvalue )
return false;
return true;
......
......@@ -214,10 +214,10 @@ class IOControl:
int maxHeartBeat;
IOController::AIOStateList::iterator aitHeartBeat;
bool force; /*!< , SM, */
bool force_out; /*!< , */
bool force; /*!< , , SM, */
bool force_out; /*!< , */
int smReadyTimeout; /*!< SM , */
int defCardNum;
int defCardNum; /*!< */
UniSetTypes::uniset_mutex iopollMutex;
bool activated;
......
......@@ -95,12 +95,13 @@ public:
virtual bool checkTime(); /*!< */
virtual timeout_t setTiming( timeout_t timeMS ); /*!< */
virtual timeout_t setTiming( timeout_t timeMS ); /*!< . timeMS = 0 */
virtual void reset(); /*!< */
virtual timeout_t getCurrent(); /*!< , */
virtual timeout_t getInterval() /*!< , , */
{
// TODO: , -
if( timeSS == WaitUpTime )
return 0;
return timeSS*10;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment