Commit a147d903 authored by Vitaly Lipatov's avatar Vitaly Lipatov

use uni_atoi instead atoi

parent bccb45a7
...@@ -649,12 +649,12 @@ int alarm(string args, UniversalInterface &ui) ...@@ -649,12 +649,12 @@ int alarm(string args, UniversalInterface &ui)
if(separateArgs(args,arg)) if(separateArgs(args,arg))
{ {
UniSetTypes::MessageCode code = atoi(arg.c_str()); UniSetTypes::MessageCode code = uni_atoi(arg);
UniSetTypes::MessageCode cause(UniSetTypes::DefaultMessageCode); UniSetTypes::MessageCode cause(UniSetTypes::DefaultMessageCode);
if(separateArgs(args,arg)) if(separateArgs(args,arg))
{ {
cause = atoi(arg.c_str()); cause = uni_atoi(arg);
} }
else else
{ {
......
...@@ -65,7 +65,7 @@ int main( int argc, char **argv ) ...@@ -65,7 +65,7 @@ int main( int argc, char **argv )
break; break;
case 't': case 't':
tout = atoi(optarg); tout = uni_atoi(optarg);
break; break;
case 'a': case 'a':
...@@ -81,7 +81,7 @@ int main( int argc, char **argv ) ...@@ -81,7 +81,7 @@ int main( int argc, char **argv )
break; break;
case 'c': case 'c':
replyVal = atoi(optarg); replyVal = uni_atoi(optarg);
break; break;
case '?': case '?':
......
...@@ -142,7 +142,7 @@ int main( int argc, char **argv ) ...@@ -142,7 +142,7 @@ int main( int argc, char **argv )
reg = ModbusRTU::str2mbData(argv[optind]); reg = ModbusRTU::str2mbData(argv[optind]);
if( checkArg(optind+1,argc,argv) ) if( checkArg(optind+1,argc,argv) )
count = atoi(argv[optind+1]); count = uni_atoi(argv[optind+1]);
break; break;
case 'f': case 'f':
...@@ -196,7 +196,7 @@ int main( int argc, char **argv ) ...@@ -196,7 +196,7 @@ int main( int argc, char **argv )
break; break;
case 't': case 't':
tout = atoi(optarg); tout = uni_atoi(optarg);
break; break;
case 'a': case 'a':
......
...@@ -64,7 +64,7 @@ int main( int argc, char **argv ) ...@@ -64,7 +64,7 @@ int main( int argc, char **argv )
break; break;
case 't': case 't':
tout = atoi(optarg); tout = uni_atoi(optarg);
break; break;
case 'a': case 'a':
......
...@@ -58,11 +58,11 @@ int main( int argc, char **argv ) ...@@ -58,11 +58,11 @@ int main( int argc, char **argv )
break; break;
case 'p': case 'p':
port = atoi(optarg); port = uni_atoi(optarg);
break; break;
case 't': case 't':
tout = atoi(optarg); tout = uni_atoi(optarg);
break; break;
case 'a': case 'a':
......
...@@ -108,7 +108,7 @@ int main( int argc, char **argv ) ...@@ -108,7 +108,7 @@ int main( int argc, char **argv )
reg = ModbusRTU::str2mbData(argv[optind]); reg = ModbusRTU::str2mbData(argv[optind]);
if( optind+1<argc && (argv[optind+1])[0]!='-' ) if( optind+1<argc && (argv[optind+1])[0]!='-' )
count = atoi(argv[optind+1]); count = uni_atoi(argv[optind+1]);
break; break;
case 'f': case 'f':
...@@ -151,11 +151,11 @@ int main( int argc, char **argv ) ...@@ -151,11 +151,11 @@ int main( int argc, char **argv )
break; break;
case 'p': case 'p':
port = atoi(optarg); port = uni_atoi(optarg);
break; break;
case 't': case 't':
tout = atoi(optarg); tout = uni_atoi(optarg);
break; break;
case 'a': case 'a':
......
...@@ -103,7 +103,7 @@ int main(int argc, char* argv[]) ...@@ -103,7 +103,7 @@ int main(int argc, char* argv[])
return 0; return 0;
case 'r': case 'r':
chan = atoi(optarg); chan = uni_atoi(optarg);
break; break;
case 'd': case 'd':
...@@ -111,35 +111,35 @@ int main(int argc, char* argv[]) ...@@ -111,35 +111,35 @@ int main(int argc, char* argv[])
break; break;
case 's': case 's':
subdev = atoi(optarg); subdev = uni_atoi(optarg);
break; break;
case 'x': case 'x':
range = atoi(optarg); range = uni_atoi(optarg);
break; break;
case 'a': case 'a':
aref = atoi(optarg); aref = uni_atoi(optarg);
break; break;
case 'o': case 'o':
openFileXml=optarg; openFileXml = optarg;
break; break;
case 'f': case 'f':
saveFileXml=optarg; saveFileXml = optarg;
break; break;
case 'n': case 'n':
nodeXml=optarg; nodeXml = optarg;
break; break;
case 'i': case 'i':
sort_rise=atoi(optarg); sort_rise = uni_atoi(optarg);
break; break;
case 'c': case 'c':
sort_cal=atoi(optarg); sort_cal = uni_atoi(optarg);
break; break;
case '?': case '?':
......
...@@ -1886,7 +1886,7 @@ void RTUExchange::updateMTR( RegMap::iterator& rit ) ...@@ -1886,7 +1886,7 @@ void RTUExchange::updateMTR( RegMap::iterator& rit )
else else
{ {
MTR::T4 t(r->mbval); MTR::T4 t(r->mbval);
IOBase::processingAsAI( &(*it),atoi(t.sval.c_str()), shm, force ); IOBase::processingAsAI( &(*it), uni_atoi(t.sval), shm, force );
} }
continue; continue;
} }
......
...@@ -59,7 +59,7 @@ int main( int argc, char **argv ) ...@@ -59,7 +59,7 @@ int main( int argc, char **argv )
break; break;
case 't': case 't':
tout = atoi(optarg); tout = uni_atoi(optarg);
break; break;
case 'q': case 'q':
......
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