fly/flightgear
1
0
Fork 0
Code Activity

Fix a bug where a test was perfromed on a variable that wasn;'t even initialized (and wrong) and add support for tab and space as a seperator

Browse source
This commit is contained in:
ehofman 2003-08-18 09:26:26 +00:00
parent 0caaeffbc6
commit a3fb470f7c
1 changed files with 52 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/Network/generic.cxx
View file

@ -55,34 +55,42 @@ FGGeneric::FGGeneric(string& config) {
SGPropertyNode *output = root.getNode("generic/output"); SGPropertyNode *output = root.getNode("generic/output");
/* These variables specified in the fgfsbase/Properties/xxxx.xml file for each format /* These variables specified in the fgfsbase/Properties/xxxx.xml file for each format
* var_sep_string = the string/charachter to place between variables * var_sep_string = the string/charachter to place between variables
* line_sep_string = the string/charachter to place at the end of each lot of variables * line_sep_string = the string/charachter to place at the end of each lot of variables
*/ */
var_sep_string = output->getStringValue("var_separator"); var_sep_string = output->getStringValue("var_separator");
line_sep_string = output->getStringValue("line_separator"); line_sep_string = output->getStringValue("line_separator");
if ( var_separator == "newline" ) if ( var_sep_string == "newline" )
var_separator = '\n'; var_separator = '\n';
else if ( var_separator == "formfeed" ) else if ( var_sep_string == "tab" )
var_separator = '\f'; var_separator = '\t';
else if ( var_separator == "carriagereturn" ) else if ( var_sep_string == "space" )
var_separator = '\r'; var_separator = ' ';
else if ( var_separator == "verticaltab" ) else if ( var_sep_string == "formfeed" )
var_separator = '\v'; var_separator = '\f';
else else if ( var_sep_string == "carriagereturn" )
var_separator = var_sep_string; var_sep_string = '\r';
else if ( var_sep_string == "verticaltab" )
var_separator = '\v';
else
var_separator = var_sep_string;
if ( line_sep_string == "newline" ) if ( line_sep_string == "newline" )
line_separator = '\n'; line_separator = '\n';
else if ( line_sep_string == "formfeed" ) if ( line_sep_string == "tab" )
line_separator = '\f'; line_separator = '\t';
else if ( line_sep_string == "carriagereturn" ) if ( line_sep_string == "space" )
line_separator = '\r'; line_separator = ' ';
else if ( line_sep_string == "verticaltab" ) else if ( line_sep_string == "formfeed" )
line_separator = '\v'; line_separator = '\f';
else else if ( line_sep_string == "carriagereturn" )
line_separator = line_sep_string; line_separator = '\r';
else if ( line_sep_string == "verticaltab" )
line_separator = '\v';
else
line_separator = line_sep_string;
vector<SGPropertyNode_ptr> chunks = output->getChildren("chunk"); vector<SGPropertyNode_ptr> chunks = output->getChildren("chunk");
@ -131,7 +139,7 @@ bool FGGeneric::gen_message() {
for (unsigned int i = 0; i < _message.size(); i++) { for (unsigned int i = 0; i < _message.size(); i++) {
if (i > 0) if (i > 0)
generic_sentence += line_separator; generic_sentence += var_separator;
switch (_message[i].type) { switch (_message[i].type) {
case FG_INT: case FG_INT:
@ -170,7 +178,7 @@ bool FGGeneric::gen_message() {
} }
bool FGGeneric::parse_message() { bool FGGeneric::parse_message() {
return true; return true;
} }
@ -178,16 +186,16 @@ bool FGGeneric::parse_message() {
// open hailing frequencies // open hailing frequencies
bool FGGeneric::open() { bool FGGeneric::open() {
if ( is_enabled() ) { if ( is_enabled() ) {
SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel " SG_LOG( SG_IO, SG_ALERT, "This shouldn't happen, but the channel "
<< "is already in use, ignoring" ); << "is already in use, ignoring" );
return false; return false;
} }
SGIOChannel *io = get_io_channel(); SGIOChannel *io = get_io_channel();
if ( ! io->open( get_direction() ) ) { if ( ! io->open( get_direction() ) ) {
SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." ); SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
return false; return false;
} }
set_enabled( true ); set_enabled( true );
@ -201,19 +209,19 @@ bool FGGeneric::process() {
SGIOChannel *io = get_io_channel(); SGIOChannel *io = get_io_channel();
if ( get_direction() == SG_IO_OUT ) { if ( get_direction() == SG_IO_OUT ) {
gen_message(); gen_message();
if ( ! io->write( buf, length ) ) { if ( ! io->write( buf, length ) ) {
SG_LOG( SG_IO, SG_ALERT, "Error writing data." ); SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
return false; return false;
} }
} else if ( get_direction() == SG_IO_IN ) { } else if ( get_direction() == SG_IO_IN ) {
// Temporarliy disable this as output only! // Temporarliy disable this as output only!
//if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) { //if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
// parse_message(); // parse_message();
//} else { //} else {
// SG_LOG( SG_IO, SG_ALERT, "Error reading data." ); // SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
// return false; // return false;
//} //}
} }
return true; return true;
@ -227,7 +235,7 @@ bool FGGeneric::close() {
set_enabled( false ); set_enabled( false );
if ( ! io->close() ) { if ( ! io->close() ) {
return false; return false;
} }
return true; return true;