Split up preference data structure definition into 'pref.h'

.. and rename the badly named 'output_units/input_units' variables.

We used to have this confusing thing where we had two different units
(input vs output) that *look* like they are mirror images, but in fact
"output_units" was the user units, and "input_units" are the XML parsing
units.

So this renames them to be clearer.  "output_units" is now just "units"
(it's the units a user would ever see), and "input_units" is now
"xml_parsing_units" and set by the XML file parsers to reflect the units
of the parsed file.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/main.c b/main.c
index c5a41590d..71742d7c0 100644
--- a/main.c
+++ b/main.c
@@ -15,7 +15,7 @@ char *debugfilename;
 FILE *debugfile;
 #endif
 
-struct units output_units;
+struct units units;
 
 /* random helper functions, used here or elsewhere */
 static int sortfn(const void *_a, const void *_b)
@@ -253,7 +253,7 @@ int main(int argc, char **argv)
 	bindtextdomain("subsurface", path);
 	bind_textdomain_codeset("subsurface", "utf-8");
 	textdomain("subsurface");
-	output_units = SI_units;
+	units = SI_units;
 
 #if DEBUGFILE > 1
 	debugfile = stderr;