Fix a segfault on exit. Introduces a small memory leak if the instrument

[flightgear.git] / src / Network / garmin.cxx

diff --git a/src/Network/garmin.cxx b/src/Network/garmin.cxx
index f45f3226f93ecf143402f4d40925e8029c6229ed..45e03c66c211c8e9193fcc54df837c811d8a1dd3 100644 (file)
--- a/src/Network/garmin.cxx
+++ b/src/Network/garmin.cxx
@@ -125,8 +125,8 @@ bool FGGarmin::gen_message() {
     sprintf( rmz, "PGRMZ,%s,f,3", altitude_ft );
     sprintf( rmz_sum, "%02X", calc_nmea_cksum(rmz) );
 
-    FG_LOG( FG_IO, FG_DEBUG, rmc );
-    FG_LOG( FG_IO, FG_DEBUG, rmz );
+    SG_LOG( SG_IO, SG_DEBUG, rmc );
+    SG_LOG( SG_IO, SG_DEBUG, rmz );
 
     string garmin_sentence;
 
@@ -155,11 +155,11 @@ bool FGGarmin::gen_message() {
 
 // parse Garmin message
 bool FGGarmin::parse_message() {
-    FG_LOG( FG_IO, FG_INFO, "parse garmin message" );
+    SG_LOG( SG_IO, SG_INFO, "parse garmin message" );
 
     string msg = buf;
     msg = msg.substr( 0, length );
-    FG_LOG( FG_IO, FG_INFO, "entire message = " << msg );
+    SG_LOG( SG_IO, SG_INFO, "entire message = " << msg );
 
     string::size_type begin_line, end_line, begin, end;
     begin_line = begin = 0;
@@ -169,12 +169,12 @@ bool FGGarmin::parse_message() {
     while ( end_line != string::npos ) {
        string line = msg.substr(begin_line, end_line - begin_line);
        begin_line = end_line + 1;
-       FG_LOG( FG_IO, FG_INFO, "  input line = " << line );
+       SG_LOG( SG_IO, SG_INFO, "  input line = " << line );
 
        // leading character
        string start = msg.substr(begin, 1);
        ++begin;
-       FG_LOG( FG_IO, FG_INFO, "  start = " << start );
+       SG_LOG( SG_IO, SG_INFO, "  start = " << start );
 
        // sentence
        end = msg.find(",", begin);
@@ -184,7 +184,7 @@ bool FGGarmin::parse_message() {
     
        string sentence = msg.substr(begin, end - begin);
        begin = end + 1;
-       FG_LOG( FG_IO, FG_INFO, "  sentence = " << sentence );
+       SG_LOG( SG_IO, SG_INFO, "  sentence = " << sentence );
 
        double lon_deg, lon_min, lat_deg, lat_min;
        double lon, lat, speed, heading, altitude;
@@ -198,7 +198,7 @@ bool FGGarmin::parse_message() {
     
            string utc = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  utc = " << utc );
+           SG_LOG( SG_IO, SG_INFO, "  utc = " << utc );
 
            // junk
            end = msg.find(",", begin);
@@ -208,7 +208,7 @@ bool FGGarmin::parse_message() {
     
            string junk = msg.substr(begin, end - begin);
            begin = end + 1;
-           FG_LOG( FG_IO, FG_INFO, "  junk = " << junk );
+           SG_LOG( SG_IO, SG_INFO, "  junk = " << junk );
 
            // lat val
            end = msg.find(",", begin);
@@ -237,7 +237,7 @@ bool FGGarmin::parse_message() {
            }
 
            cur_fdm_state->set_Latitude( lat * SGD_DEGREES_TO_RADIANS );
-           FG_LOG( FG_IO, FG_INFO, "  lat = " << lat );
+           SG_LOG( SG_IO, SG_INFO, "  lat = " << lat );
 
            // lon val
            end = msg.find(",", begin);
@@ -266,7 +266,7 @@ bool FGGarmin::parse_message() {
            }
 
            cur_fdm_state->set_Longitude( lon * SGD_DEGREES_TO_RADIANS );
-           FG_LOG( FG_IO, FG_INFO, "  lon = " << lon );
+           SG_LOG( SG_IO, SG_INFO, "  lon = " << lon );
 
 #if 0
            double sl_radius, lat_geoc;
@@ -289,7 +289,7 @@ bool FGGarmin::parse_message() {
            speed = atof( speed_str.c_str() );
            cur_fdm_state->set_V_calibrated_kts( speed );
            // cur_fdm_state->set_V_ground_speed( speed );
-           FG_LOG( FG_IO, FG_INFO, "  speed = " << speed );
+           SG_LOG( SG_IO, SG_INFO, "  speed = " << speed );
 
            // heading
            end = msg.find(",", begin);
@@ -303,7 +303,7 @@ bool FGGarmin::parse_message() {
            cur_fdm_state->set_Euler_Angles( cur_fdm_state->get_Phi(), 
                                             cur_fdm_state->get_Theta(), 
                                             heading * SGD_DEGREES_TO_RADIANS );
-           FG_LOG( FG_IO, FG_INFO, "  heading = " << heading );
+           SG_LOG( SG_IO, SG_INFO, "  heading = " << heading );
        } else if ( sentence == "PGRMZ" ) {
            // altitude
            end = msg.find(",", begin);
@@ -324,13 +324,13 @@ bool FGGarmin::parse_message() {
            string alt_units = msg.substr(begin, end - begin);
            begin = end + 1;
 
-           if ( alt_units != "F" && alt_units != "f" ) {
+           if ( alt_units != (string)"F" && alt_units != (string)"f" ) {
                altitude *= SG_METER_TO_FEET;
            }
 
            cur_fdm_state->set_Altitude( altitude );
     
-           FG_LOG( FG_IO, FG_INFO, " altitude  = " << altitude );
+           SG_LOG( SG_IO, SG_INFO, " altitude  = " << altitude );
 
        }
 
@@ -347,7 +347,7 @@ bool FGGarmin::parse_message() {
 // open hailing frequencies
 bool FGGarmin::open() {
     if ( is_enabled() ) {
-       FG_LOG( FG_IO, FG_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" );
        return false;
     }
@@ -355,7 +355,7 @@ bool FGGarmin::open() {
     SGIOChannel *io = get_io_channel();
 
     if ( ! io->open( get_direction() ) ) {
-       FG_LOG( FG_IO, FG_ALERT, "Error opening channel communication layer." );
+       SG_LOG( SG_IO, SG_ALERT, "Error opening channel communication layer." );
        return false;
     }
 
@@ -372,30 +372,30 @@ bool FGGarmin::process() {
     if ( get_direction() == SG_IO_OUT ) {
        gen_message();
        if ( ! io->write( buf, length ) ) {
-           FG_LOG( FG_IO, FG_ALERT, "Error writing data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error writing data." );
            return false;
        }
     } else if ( get_direction() == SG_IO_IN ) {
        if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
-           FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
+           SG_LOG( SG_IO, SG_ALERT, "Success reading data." );
            if ( parse_message() ) {
-               FG_LOG( FG_IO, FG_ALERT, "Success parsing data." );
+               SG_LOG( SG_IO, SG_ALERT, "Success parsing data." );
            } else {
-               FG_LOG( FG_IO, FG_ALERT, "Error parsing data." );
+               SG_LOG( SG_IO, SG_ALERT, "Error parsing data." );
            }
        } else {
-           FG_LOG( FG_IO, FG_ALERT, "Error reading data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
            return false;
        }
        if ( (length = io->readline( buf, FG_MAX_MSG_SIZE )) > 0 ) {
-           FG_LOG( FG_IO, FG_ALERT, "Success reading data." );
+           SG_LOG( SG_IO, SG_ALERT, "Success reading data." );
            if ( parse_message() ) {
-               FG_LOG( FG_IO, FG_ALERT, "Success parsing data." );
+               SG_LOG( SG_IO, SG_ALERT, "Success parsing data." );
            } else {
-               FG_LOG( FG_IO, FG_ALERT, "Error parsing data." );
+               SG_LOG( SG_IO, SG_ALERT, "Error parsing data." );
            }
        } else {
-           FG_LOG( FG_IO, FG_ALERT, "Error reading data." );
+           SG_LOG( SG_IO, SG_ALERT, "Error reading data." );
            return false;
        }
     }