+static const char *country, *city;
+
+static void divinglog_place(char *place, void *_location)
+{
+ char **location = _location;
+ char buffer[256], *p;
+ int len;
+
+ len = snprintf(buffer, sizeof(buffer),
+ "%s%s%s%s%s",
+ place,
+ city ? ", " : "",
+ city ? city : "",
+ country ? ", " : "",
+ country ? country : "");
+
+ p = malloc(len+1);
+ memcpy(p, buffer, len+1);
+ *location = p;
+
+ city = NULL;
+ country = NULL;
+}
+
+static int divinglog_dive_match(struct dive *dive, const char *name, int len, char *buf)
+{
+ return MATCH(".divedate", divedate, &dive->when) ||
+ MATCH(".entrytime", divetime, &dive->when) ||
+ MATCH(".depth", depth, &dive->maxdepth) ||
+ MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
+ MATCH(".tanktype", utf8_string, &dive->cylinder[0].type.description) ||
+ MATCH(".comments", utf8_string, &dive->notes) ||
+ MATCH(".country.name", utf8_string, &country) ||
+ MATCH(".city.name", utf8_string, &city) ||
+ MATCH(".place.name", divinglog_place, &dive->location) ||
+ 0;
+}
+