From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 Sep 2011 21:44:27 +0000 (-0700)
Subject: Merge branch 'open-files' of git://github.com/nathansamson/diveclog
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=c24fd4b82cf4476c6d9c863ee03f2d729b64e5f0;p=ext%2Fsubsurface.git

Merge branch 'open-files' of git://github.com/nathansamson/diveclog

* 'open-files' of git://github.com/nathansamson/diveclog:
  Report errors when opening files
  Make it possible to load multiple files at once.
  Open File works. I refactored the code and introduced a new type. I never used it as a pointer (their was no real reason), but I'm not really satisfied.
---

c24fd4b82cf4476c6d9c863ee03f2d729b64e5f0
diff --cc parse-xml.c
index 8aaeedc,26e322f..90fdb1a
--- a/parse-xml.c
+++ b/parse-xml.c
@@@ -1225,10 -1115,11 +1225,10 @@@ static void reset_all(void
  	 * dive for that format.
  	 */
  	units = SI_units;
 -	suunto = 0;
 -	uemis = 0;
 +	import_source = UNKNOWN;
  }
  
- void parse_xml_file(const char *filename)
+ void parse_xml_file(const char *filename, GError **error)
  {
  	xmlDoc *doc;