From d455f5f4458ce7c446807bcc5d62e48c9186cb1b Mon Sep 17 00:00:00 2001
From: Florent Rougon <f.rougon@free.fr>
Date: Tue, 10 Oct 2017 15:34:04 +0200
Subject: [PATCH] props_io.cxx: use SG_ORIGIN when throwing exceptions

This will provide more accurate info than the fixed string "SimGear
Property Reader".
---
 simgear/props/props_io.cxx | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/simgear/props/props_io.cxx b/simgear/props/props_io.cxx
index 12e2b9e8..a0e0b90b 100644
--- a/simgear/props/props_io.cxx
+++ b/simgear/props/props_io.cxx
@@ -161,8 +161,7 @@ setFlag( int& mode,
     string message = "Unrecognized flag value '";
     message += flag;
     message += '\'';
-				// FIXME: add location info
-    throw sg_io_exception(message, location, "SimGear Property Reader");
+    throw sg_io_exception(message, location, SG_ORIGIN);
   }
 }
 
@@ -177,7 +176,7 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
       string message = "Root element name is ";
       message += name;
       message += "; expected PropertyList";
-      throw sg_io_exception(message, location, "SimGear Property Reader");
+      throw sg_io_exception(message, location, SG_ORIGIN);
     }
 
     // Check for an include.
@@ -189,8 +188,7 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
           {
               string message ="Cannot open file ";
               message += attval;
-              throw sg_io_exception(message, location,
-                                    "SimGear Property Reader");
+              throw sg_io_exception(message, location, SG_ORIGIN);
           }
           readProperties(path, _root, 0, _extended);
       } catch (sg_io_exception &e) {
@@ -277,7 +275,7 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
           {
             string message ="Cannot open file ";
             message += val;
-            throw sg_io_exception(message, location, "SimGear Property Reader");
+            throw sg_io_exception(message, location, SG_ORIGIN);
           }
           readProperties(path, node, 0, _extended);
         }
@@ -352,8 +350,7 @@ PropsVisitor::endElement (const char * name)
       string message = "Unrecognized data type '";
       message += st.type;
       message += '\'';
-      // FIXME: add location information
-      throw sg_io_exception(message, location, "SimGear Property Reader");
+      throw sg_io_exception(message, location, SG_ORIGIN);
     }
     if( !ret )
       SG_LOG
@@ -770,7 +767,7 @@ copyPropertyValue(const SGPropertyNode *in, SGPropertyNode *out)
                 break;
             string message = "Unknown internal SGPropertyNode type";
             message += in->getType();
-            throw sg_error(message, "SimGear Property Reader");
+            throw sg_error(message, SG_ORIGIN);
     }
     
     return retval;