Fix build errors from libdivecomputer master merge

Three issues introduced by the merge of libdivecomputer/master:

1. parser.h: DC_SAMPLE_LOCATION was added to parsers (divesoft_freedom,
   divesystem_idive, halcyon_symbios, shearwater_predator) but the
   corresponding enum value was omitted from dc_sample_type_t.  Add
   DC_SAMPLE_LOCATION after DC_SAMPLE_TTS and add the matching #define
   guard for compile-time feature testing.

2. shearwater_predator_parser.c (DC_FIELD_LOCATION case): latitude and
   longitude were used but never declared.  The upstream version declared
   them as signed int inside a block; reproduce that with an explicit
   block scope so the variables are properly declared.

3. shearwater_petrel.c: shearwater_common_get_model() returns an
   unsigned int, but HEXDUMP expects const unsigned char *.  Add an
   explicit cast to silence the incompatible-pointer-type error.

Signed-off-by: Michael Keller <github@ike.ch>

Author: mikeller

include/libdivecomputer/parser.h

@@ -48,10 +48,13 @@ typedef enum dc_sample_type_t {
 	DC_SAMPLE_DECO,
 	DC_SAMPLE_GASMIX,
 	DC_SAMPLE_TTS,		// time to surface in seconds
+	DC_SAMPLE_LOCATION,
 } dc_sample_type_t;
 
 // Make it easy to test support compile-time with "#ifdef DC_SAMPLE_TTS"
 #define DC_SAMPLE_TTS DC_SAMPLE_TTS
+// Make it easy to test support compile-time with "#ifdef DC_SAMPLE_LOCATION"
+#define DC_SAMPLE_LOCATION DC_SAMPLE_LOCATION
 
 typedef enum dc_field_type_t {
 	DC_FIELD_DIVETIME,

src/shearwater_petrel.c

@@ -197,7 +197,7 @@ shearwater_petrel_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
 		return rc;
 	}
 
-	HEXDUMP(abstract->context, DC_LOGLEVEL_DEBUG, "Model", &model, sizeof(model));
+	HEXDUMP(abstract->context, DC_LOGLEVEL_DEBUG, "Model", (const unsigned char *) &model, sizeof(model));
 
 	// Emit a device info event.
 	dc_event_devinfo_t devinfo;

src/shearwater_predator_parser.c

@@ -126,9 +126,6 @@
 
 #define UNDEFINED 0xFFFFFFFF
 
-#define GNSS_FIX_2D 2
-#define GNSS_FIX_3D 3
-
 typedef struct shearwater_predator_parser_t shearwater_predator_parser_t;
 
 typedef struct shearwater_predator_gasmix_t {
@@ -1120,15 +1117,17 @@ shearwater_predator_parser_get_field (dc_parser_t *abstract, dc_field_type_t typ
 			if (parser->opening[9] == UNDEFINED || parser->aimode != AI_ON_GPS)
 				return DC_STATUS_UNSUPPORTED;
 
-			unsigned int gnss_status = data[parser->opening[9] + 16];
-			if (!(gnss_status == GNSS_FIX_2D || gnss_status == GNSS_FIX_3D))
-				return DC_STATUS_UNSUPPORTED;
+			{
+				unsigned int gnss_status = data[parser->opening[9] + 16];
+				if (!(gnss_status == GNSS_FIX_2D || gnss_status == GNSS_FIX_3D))
+					return DC_STATUS_UNSUPPORTED;
 
-			latitude  = (signed int) array_uint32_be (data + parser->opening[9] + 21);
-			longitude = (signed int) array_uint32_be (data + parser->opening[9] + 25);
-			location->latitude  = latitude  / 100000.0;
-			location->longitude = longitude / 100000.0;
-			location->altitude  = 0.0;
+				signed int latitude  = (signed int) array_uint32_be (data + parser->opening[9] + 21);
+				signed int longitude = (signed int) array_uint32_be (data + parser->opening[9] + 25);
+				location->latitude  = latitude  / 100000.0;
+				location->longitude = longitude / 100000.0;
+				location->altitude  = 0.0;
+			}
 			break;
 		case DC_FIELD_STRING:
 			return dc_field_get_string(&parser->cache, flags, string);