Merge branch 'weight' of git://subsurface.hohndel.org/subsurface

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index bfaa076b1eba08085a6329da989a230dd79d7e87..39f203738833519c594c50032146d13f867c49a2 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -272,9 +272,11 @@ static inline struct dive *get_dive(unsigned int nr)
 }
 
 extern void parse_xml_init(void);
-extern void parse_xml_file(const char *filename, GError **error);
+extern void parse_xml_buffer(const char *url, const char *buf, int size, GError **error);
 extern void set_filename(const char *filename);
 
+extern void parse_file(const char *filename, GError **error);
+
 #ifdef XSLT
 extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
 #endif
@@ -299,7 +301,7 @@ extern struct dive *alloc_dive(void);
 extern void record_dive(struct dive *dive);
 
 extern struct sample *prepare_sample(struct dive **divep);
-extern void finish_sample(struct dive *dive, struct sample *sample);
+extern void finish_sample(struct dive *dive);
 
 extern void report_dives(gboolean imported);
 extern struct dive *fixup_dive(struct dive *dive);
@@ -344,4 +346,6 @@ const char *monthname(int mon);
 #define FIVE_STARS     UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR
 extern const char *star_strings[];
 
+#define AIR_PERMILLE 209
+
 #endif /* DIVE_H */