Commit 766fe809 authored by Pavel Vainerman's avatar Pavel Vainerman

Прошёлся по всем утилитам и откорректировал возвращаемые значения

при завершение, для корректного использования в скриптах на bash.
parent 590c0bdc
......@@ -70,6 +70,8 @@ int main(int argc, char** argv)
act.addObject(static_cast<class UniSetObject*>(&is));
act.run(false);
}
return 0;
}
catch(Exception& ex)
{
......@@ -80,5 +82,5 @@ int main(int argc, char** argv)
cerr << "(InfoServer::main): catch ..." << endl;
}
return 0;
return 1;
}
......@@ -77,6 +77,7 @@ int main(int argc, char** argv)
ObjectsActivator act;
act.addObject(static_cast<class UniSetObject*>(&nc));
act.run(false);
return 0;
}
catch(Exception& ex)
{
......@@ -87,5 +88,5 @@ int main(int argc, char** argv)
cerr << "(nullController::main): catch ..." << endl;
}
return 0;
return 1;
}
......@@ -40,6 +40,7 @@ int main( int argc, const char **argv )
SystemMessage sm(SystemMessage::StartUp);
act.broadcast( sm.transport_msg() );
act.run(false);
return 0;
}
catch( Exception& ex )
{
......@@ -50,6 +51,6 @@ int main( int argc, const char **argv )
cout << "(main): Неизвестное исключение!!!!"<< endl;
}
return 0;
return 1;
}
// ------------------------------------------------------------------------------------------
......@@ -46,6 +46,8 @@ int main(int argc, const char **argv)
}
else
sv.view();
return 0;
}
catch(Exception& ex )
{
......@@ -56,5 +58,5 @@ int main(int argc, const char **argv)
cerr << "(main): Неизвестное исключение!!!!"<< endl;
}
return 0;
return 1;
}
......@@ -3,7 +3,7 @@
Name: libuniset
Version: 1.0
Release: alt14
Release: alt15
Summary: UniSet - library for building distributed industrial control systems
License: GPL
Group: Development/C++
......@@ -191,6 +191,9 @@ rm -f %buildroot%_libdir/*.la
%exclude %_pkgconfigdir/libUniSet.pc
%changelog
* Sat Mar 26 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt15
- fixed return value in some utilities
* Thu Mar 24 2011 Pavel Vainerman <pv@altlinux.ru> 1.0-alt14
- fixed bug in MBSlave
......
......@@ -147,7 +147,7 @@ int main(int argc, char* argv[])
case '?':
default:
printf("? argument\n");
return 0;
return 1;
}
}
......@@ -419,7 +419,6 @@ void openXML()
}
uxml.close();
return;
}
catch( ... )
{
......
......@@ -65,6 +65,7 @@ int main(int argc, const char **argv)
act.run(true);
msleep(500);
ic->execute();
return 0;
}
catch(SystemError& err)
{
......@@ -79,5 +80,5 @@ int main(int argc, const char **argv)
dlog[Debug::CRIT] << "(iocontrol): catch(...)" << endl;
}
return 0;
return 1;
}
......@@ -35,6 +35,7 @@ int main(int argc, const char **argv)
LProcessor plc;
plc.execute(schema);
return 0;
}
catch( LogicException& ex )
{
......@@ -49,6 +50,6 @@ int main(int argc, const char **argv)
cerr << " catch ... " << endl;
}
return 0;
return 1;
}
// -----------------------------------------------------------------------------
......@@ -81,7 +81,7 @@ int main(int argc, const char **argv)
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- IOControl START -------------------------\n\n";
act.run(false);
pause();
return 0;
}
catch( LogicException& ex )
{
......@@ -96,6 +96,6 @@ int main(int argc, const char **argv)
cerr << " catch ... " << endl;
}
return 0;
return 1;
}
// -----------------------------------------------------------------------------
......@@ -69,6 +69,7 @@ int main( int argc, const char** argv )
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- MBTCP Exchange START -------------------------\n\n";
act.run(false);
return 0;
}
catch( Exception& ex )
{
......@@ -79,5 +80,5 @@ int main( int argc, const char** argv )
dlog[Debug::CRIT] << "(mbtcpmaster): catch ..." << std::endl;
}
return 0;
return 1;
}
......@@ -74,7 +74,7 @@ int main(int argc, const char **argv)
dlog[Debug::ANY] << "(main): -------------- MBSlave START -------------------------\n\n";
act.run(false);
return 0;
}
catch( SystemError& err )
{
......@@ -93,6 +93,6 @@ int main(int argc, const char **argv)
dlog[Debug::CRIT] << "(mbslave): catch(...)" << endl;
}
return 0;
return 1;
}
// --------------------------------------------------------------------------
......@@ -363,6 +363,7 @@ int main( int argc, char **argv )
return 1;
}
return 0;
}
catch( ModbusRTU::mbException& ex )
{
......@@ -381,7 +382,7 @@ int main( int argc, char **argv )
cerr << "(mtr-setup): catch(...)" << endl;
}
return 0;
return 1;
}
// --------------------------------------------------------------------------
char* checkArg( int i, int argc, char* argv[] )
......
......@@ -120,6 +120,7 @@ int main( int argc, const char **argv )
else
{
cout << " Unknown type: " << type << endl;
return 1;
}
return 0;
......
......@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act.run(false);
// msleep(500);
// rs->execute();
return 0;
}
catch( Exception& ex )
{
......@@ -80,5 +81,5 @@ int main( int argc, char** argv )
dlog[Debug::CRIT] << "(rtuexchange): catch ..." << std::endl;
}
return 0;
return 1;
}
......@@ -108,6 +108,8 @@ int main( int argc, char **argv )
cout << "UNIO1 AI" << i << ": " << rtu.getFloat( RTUStorage::nJ1, i, UniversalIO::AnalogInput ) << endl;
for( int i=0; i<24; i++ )
cout << "UNIO1 DI" << i << ": " << rtu.getState( RTUStorage::nJ1, i, UniversalIO::DigitalInput ) << endl;
return 0;
}
catch( ModbusRTU::mbException& ex )
{
......@@ -126,6 +128,6 @@ int main( int argc, char **argv )
cerr << "(rtustate): catch(...)" << endl;
}
return 0;
return 1;
}
// --------------------------------------------------------------------------
......@@ -69,6 +69,7 @@ int main( int argc, const char** argv )
dlog(Debug::ANY) << "\n\n\n";
dlog[Debug::ANY] << "(main): -------------- SMDBServer START -------------------------\n\n";
act.run(false);
return 0;
}
catch( Exception& ex )
{
......@@ -79,5 +80,5 @@ int main( int argc, const char** argv )
dlog[Debug::CRIT] << "(smdbserver): catch ..." << std::endl;
}
return 0;
return 1;
}
......@@ -36,6 +36,7 @@ int main( int argc, const char **argv )
SMViewer smv(shmID);
smv.run();
return 0;
}
catch( Exception& ex )
{
......@@ -46,6 +47,6 @@ int main( int argc, const char **argv )
cout << "Неизвестное исключение!!!!"<< endl;
}
return 0;
return 1;
}
// ------------------------------------------------------------------------------------------
......@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act.run(false);
// msleep(500);
// rs->execute();
return 0;
}
catch( Exception& ex )
{
......@@ -80,5 +81,5 @@ int main( int argc, char** argv )
dlog[Debug::CRIT] << "(udpexchange): catch ..." << std::endl;
}
return 0;
return 1;
}
......@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act.run(false);
// msleep(500);
// rs->execute();
return 0;
}
catch( Exception& ex )
{
......@@ -86,5 +87,5 @@ int main( int argc, char** argv )
dlog[Debug::CRIT] << "(udpexchange): catch ..." << std::endl;
}
return 0;
return 1;
}
......@@ -70,6 +70,7 @@ int main( int argc, char** argv )
act.run(false);
// msleep(500);
// rs->execute();
return 0;
}
catch( Exception& ex )
{
......@@ -84,5 +85,5 @@ int main( int argc, char** argv )
dlog[Debug::CRIT] << "(udpsender): catch ..." << std::endl;
}
return 0;
return 1;
}
......@@ -68,6 +68,7 @@ int main( int argc, char** argv )
dlog[Debug::ANY] << "(main): -------------- UDPReceiver START -------------------------\n\n";
act.run(false);
return 0;
}
catch( Exception& ex )
{
......@@ -84,5 +85,5 @@ int main( int argc, char** argv )
dlog[Debug::CRIT] << "(unetexchange): catch ..." << std::endl;
}
return 0;
return 1;
}
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