Remove unused variables

Author: latishab

libdivecomputer/include/libdivecomputer/bluetooth.h

@@ -132,4 +132,4 @@ dc_bluetooth_open (dc_iostream_t **iostream, dc_context_t *context, dc_bluetooth
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-#endif /* DC_BLUETOOTH_H */
+#endif /* DC_BLUETOOTH_H */

libdivecomputer/include/libdivecomputer/descriptor.h

@@ -23,6 +23,7 @@
 #define DC_DESCRIPTOR_H
 
 #include "common.h"
+#include "context.h"
 #include "iterator.h"
 
 #ifdef __cplusplus
@@ -38,11 +39,15 @@ typedef struct dc_descriptor_t dc_descriptor_t;
  * Create an iterator to enumerate the supported dive computers.
  *
  * @param[out] iterator  A location to store the iterator.
+ * @param[in]  context   A valid device descriptor.
  * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
  * on failure.
  */
 dc_status_t
-dc_descriptor_iterator (dc_iterator_t **iterator);
+dc_descriptor_iterator_new (dc_iterator_t **iterator, dc_context_t *context);
+
+/* For backwards compatibility */
+#define dc_descriptor_iterator(iterator) dc_descriptor_iterator_new(iterator, NULL)
 
 /**
  * Free the device descriptor.
@@ -122,4 +127,4 @@ dc_descriptor_filter (const dc_descriptor_t *descriptor, dc_transport_t transpor
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
-#endif /* DC_DESCRIPTOR_H */
+#endif /* DC_DESCRIPTOR_H */

libdivecomputer/src/bluetooth.c

@@ -52,15 +52,14 @@
 #include "iostream-private.h"
 #include "iterator-private.h"
 #include "platform.h"
+#include "array.h"
 
 #ifdef _WIN32
 #define DC_ADDRESS_FORMAT "%012I64X"
 #else
 #define DC_ADDRESS_FORMAT "%012llX"
 #endif
 
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-
 #define MAX_DEVICES 255
 #define MAX_PERIODS 8
 
@@ -569,4 +568,4 @@ dc_bluetooth_open (dc_iostream_t **out, dc_context_t *context, dc_bluetooth_addr
 #else
 	return DC_STATUS_UNSUPPORTED;
 #endif
-}
+}

libdivecomputer/src/descriptor.c

@@ -29,9 +29,7 @@
 
 #include "iterator-private.h"
 #include "platform.h"
-
-#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
-#define C_ARRAY_ITEMSIZE(array) (sizeof *(array))
+#include "array.h"
 
 #define DC_FILTER_INTERNAL(key, values, isnullterminated, match) \
 	dc_filter_internal( \
@@ -41,6 +39,10 @@
 		C_ARRAY_ITEMSIZE(values), \
 		match)
 
+#undef dc_descriptor_iterator
+
+dc_status_t dc_descriptor_iterator (dc_iterator_t **out);
+
 typedef int (*dc_match_t)(const void *, const void *);
 
 typedef int (*dc_filter_t) (const dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
@@ -330,7 +332,7 @@ static const dc_descriptor_t g_descriptors[] = {
 	{"Heinrichs Weikamp", "OSTC Plus",  DC_FAMILY_HW_OSTC3, 0x13, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"Heinrichs Weikamp", "OSTC Plus",  DC_FAMILY_HW_OSTC3, 0x1A, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"Heinrichs Weikamp", "OSTC 4",     DC_FAMILY_HW_OSTC3, 0x3B, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
-	{"Heinrichs Weikamp", "OSTC 5",     DC_FAMILY_HW_OSTC3, 0x3B, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw}
+	{"Heinrichs Weikamp", "OSTC 5",     DC_FAMILY_HW_OSTC3, 0x3B, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
 	{"Heinrichs Weikamp", "OSTC cR",    DC_FAMILY_HW_OSTC3, 0x05, DC_TRANSPORT_SERIAL, NULL},
 	{"Heinrichs Weikamp", "OSTC cR",    DC_FAMILY_HW_OSTC3, 0x07, DC_TRANSPORT_SERIAL, NULL},
 	{"Heinrichs Weikamp", "OSTC Sport", DC_FAMILY_HW_OSTC3, 0x12, DC_TRANSPORT_SERIAL | DC_TRANSPORT_BLUETOOTH | DC_TRANSPORT_BLE, dc_filter_hw},
@@ -694,7 +696,7 @@ dc_filter_hw (const dc_descriptor_t *descriptor, dc_transport_t transport, const
 
 	if (transport == DC_TRANSPORT_BLUETOOTH || transport == DC_TRANSPORT_BLE) {
 		return DC_FILTER_INTERNAL (userdata, bluetooth, 0, dc_match_prefix);
-	} 
+	}
 
 	return 1;
 }
@@ -718,7 +720,7 @@ dc_filter_shearwater (const dc_descriptor_t *descriptor, dc_transport_t transpor
 
 	if (transport == DC_TRANSPORT_BLUETOOTH || transport == DC_TRANSPORT_BLE) {
 		return DC_FILTER_INTERNAL (userdata, bluetooth, 0, dc_match_name);
-	} 
+	}
 
 	return 1;
 }
@@ -732,7 +734,7 @@ dc_filter_tecdiving (const dc_descriptor_t *descriptor, dc_transport_t transport
 
 	if (transport == DC_TRANSPORT_BLUETOOTH) {
 		return DC_FILTER_INTERNAL (userdata, bluetooth, 0, dc_match_name);
-	} 
+	}
 
 	return 1;
 }
@@ -812,7 +814,7 @@ dc_filter_mclean(const dc_descriptor_t *descriptor, dc_transport_t transport, co
 
 	if (transport == DC_TRANSPORT_BLUETOOTH || transport == DC_TRANSPORT_BLE) {
 		return DC_FILTER_INTERNAL (userdata, bluetooth, 0, dc_match_name);
-	} 
+	}
 
 	return 1;
 }
@@ -927,7 +929,7 @@ dc_filter_halcyon (const dc_descriptor_t *descriptor, dc_transport_t transport,
 }
 
 dc_status_t
-dc_descriptor_iterator (dc_iterator_t **out)
+dc_descriptor_iterator_new (dc_iterator_t **out, dc_context_t *context)
 {
 	dc_descriptor_iterator_t *iterator = NULL;
 
@@ -945,6 +947,12 @@ dc_descriptor_iterator (dc_iterator_t **out)
 	return DC_STATUS_SUCCESS;
 }
 
+dc_status_t
+dc_descriptor_iterator (dc_iterator_t **out)
+{
+	return dc_descriptor_iterator_new (out, NULL);
+}
+
 static dc_status_t
 dc_descriptor_iterator_next (dc_iterator_t *abstract, void *out)
 {
@@ -1030,4 +1038,4 @@ dc_descriptor_filter (const dc_descriptor_t *descriptor, dc_transport_t transpor
 		return 1;
 
 	return descriptor->filter (descriptor, transport, userdata);
-}
+}