summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2018-10-14 20:01:20 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2018-10-15 21:00:17 -0400
commit7f49e43d767211a654d26240b5a33397153265ef (patch)
treebc65909a973fed350712bf2590a9d3905372a3fa
parent253510c55586c06e42b26e480db3b19a5f1a4a3a (diff)
downloadsubsurface-7f49e43d767211a654d26240b5a33397153265ef.tar.gz
Cleanup: make xml_parsing_units local to parse-xml.c
xml_parsing_units stores the units of the currently parsed XML file. It is not used outside of parse-xml.c. Therefore, make it of static linkage and remove the declaration from dive.h. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--core/dive.h1
-rw-r--r--core/parse-xml.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/core/dive.h b/core/dive.h
index ef69bc934..659def142 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -427,7 +427,6 @@ extern void unregister_trip(dive_trip_t *trip);
extern void free_trip(dive_trip_t *trip);
extern const struct units SI_units, IMPERIAL_units;
-extern struct units xml_parsing_units;
extern const struct units *get_units(void);
extern int run_survey, verbose, quit, force_root;
diff --git a/core/parse-xml.c b/core/parse-xml.c
index 2577d6380..5c6d8f94f 100644
--- a/core/parse-xml.c
+++ b/core/parse-xml.c
@@ -35,7 +35,7 @@ int last_xml_version = -1;
static xmlDoc *test_xslt_transforms(xmlDoc *doc, const char **params);
-struct units xml_parsing_units;
+static struct units xml_parsing_units;
const struct units SI_units = SI_UNITS;
const struct units IMPERIAL_units = IMPERIAL_UNITS;