fly/flightgear
1
0
Fork 0
Code Activity

another small bug-fix

Browse source
This commit is contained in:
Erik Hofman 2017-03-24 14:11:44 +01:00
parent 6fc61984df
commit ed924b6da4
1 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
utils/xmlgrep/metadata.c
View file

@ -219,11 +219,14 @@ const char*
jsb_engine_tag(void *xid, char *path) jsb_engine_tag(void *xid, char *path)
{ {
void *xeid = xmlNodeGet(xid, "/fdm_config/propulsion/engine"); void *xeid = xmlNodeGet(xid, "/fdm_config/propulsion/engine");
char *engine = xmlAttributeGetString(xeid, "file"); char *engine, *fname;
char *fname = calloc(1, strlen(path)+strlen("Engines/")+
strlen(engine)+strlen(".xml")+1);
const char *rv = NULL; const char *rv = NULL;
if (!xeid) return rv;
engine = xmlAttributeGetString(xeid, "file");
fname = calloc(1, strlen(path)+strlen("Engines/")+
strlen(engine)+strlen(".xml")+1);
if (fname) if (fname)
{ {
void *xfid; void *xfid;
@ -262,11 +265,14 @@ const char*
jsb_propulsion_tag(void *xid, char *path) jsb_propulsion_tag(void *xid, char *path)
{ {
void *xeid = xmlNodeGet(xid, "fdm_config/propulsion/engine"); void *xeid = xmlNodeGet(xid, "fdm_config/propulsion/engine");
char *file = xmlAttributeGetString(xeid, "file"); char *file, *fname;
char *fname = calloc(1, strlen(path)+strlen("Engines/")+
strlen(file)+strlen(".xml")+1);
const char *rv = NULL; const char *rv = NULL;
if (!xeid) return rv;
file = xmlAttributeGetString(xeid, "file");
fname = calloc(1, strlen(path)+strlen("Engines/")+
strlen(file)+strlen(".xml")+1);
if (fname) if (fname)
{ {
void *xfid; void *xfid;
@ -302,11 +308,14 @@ const char*
jsb_thruster_tag(void *xid, char *path) jsb_thruster_tag(void *xid, char *path)
{ {
void *xeid = xmlNodeGet(xid, "/fdm_config/propulsion/engine/thruster"); void *xeid = xmlNodeGet(xid, "/fdm_config/propulsion/engine/thruster");
char *file = xmlAttributeGetString(xeid, "file"); char *file, *fname;
char *fname = calloc(1, strlen(path)+strlen("Engines/")+
strlen(file)+strlen(".xml")+1);
const char *rv = NULL; const char *rv = NULL;
if (!xeid) return rv;
file = xmlAttributeGetString(xeid, "file");
fname = calloc(1, strlen(path)+strlen("Engines/")+
strlen(file)+strlen(".xml")+1);
if (fname) if (fname)
{ {
void *xfid; void *xfid;
@ -399,18 +408,18 @@ yasim_wing_tag(void *xid)
double wing_z = 0.0; double wing_z = 0.0;
double eye_z = 0.0; double eye_z = 0.0;
if (xmlNodeTest(xid, "airplane/rotor")) { if (xmlNodeTest(xid, "/airplane/rotor")) {
return "helicopter"; return "helicopter";
} }
xwid = xmlNodeGet(xid, "airplane/wing"); xwid = xmlNodeGet(xid, "/airplane/wing");
if (xwid) if (xwid)
{ {
wing_z = xmlAttributeGetDouble(xwid, "z"); wing_z = xmlAttributeGetDouble(xwid, "z");
xmlFree(xwid); xmlFree(xwid);
} }
xcid = xmlNodeGet(xid, "airplane/cockpit"); xcid = xmlNodeGet(xid, "/airplane/cockpit");
if (xcid) if (xcid)
{ {
eye_z = xmlAttributeGetDouble(xcid, "z"); eye_z = xmlAttributeGetDouble(xcid, "z");
@ -424,7 +433,7 @@ yasim_wing_tag(void *xid)
const char* const char*
yasim_gear_tag(void *xid) yasim_gear_tag(void *xid)
{ {
void *xaid = xmlNodeGet(xid, "airplane"); void *xaid = xmlNodeGet(xid, "/airplane");
void *xgid = xmlMarkId(xaid); void *xgid = xmlMarkId(xaid);
double nose_x = 0.0; double nose_x = 0.0;
double main_x = 0.0; double main_x = 0.0;
@ -455,7 +464,7 @@ yasim_gear_tag(void *xid)
const char* const char*
yasim_gear_retract_tag(void *xid) yasim_gear_retract_tag(void *xid)
{ {
void *xaid = xmlNodeGet(xid, "airplane"); void *xaid = xmlNodeGet(xid, "/airplane");
void *xgid = xmlMarkId(xaid); void *xgid = xmlMarkId(xaid);
char *rv = "fixed-gear"; char *rv = "fixed-gear";
int found = 0; int found = 0;
@ -491,7 +500,7 @@ yasim_gear_retract_tag(void *xid)
const char* const char*
yasim_gear_steering_tag(void *xid) yasim_gear_steering_tag(void *xid)
{ {
void *xaid = xmlNodeGet(xid, "airplane"); void *xaid = xmlNodeGet(xid, "/airplane");
void *xgid = xmlMarkId(xaid); void *xgid = xmlMarkId(xaid);
char *rv = "no-steering"; char *rv = "no-steering";
int found = 0; int found = 0;