mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename ostc_get_data_descriptor to get_descriptor

Browse source 
This renames and cleans up ostc_get_data_descriptor into get_descriptor,
for more generic use.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2016-12-28 20:55:53 +01:00 • committed by Dirk Hohndel
parent db8e786f85
commit 00629c861c
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/libdivecomputer.c
View file

@ -1138,29 +1138,29 @@ dc_status_t libdc_buffer_parser(struct dive *dive, device_data_t *data, unsigned
/* /*
* Returns a dc_descriptor_t structure based on dc model's number and family. * Returns a dc_descriptor_t structure based on dc model's number and family.
*
* That dc_descriptor_t needs to be freed with dc_descriptor_free by the reciver.
*/ */
dc_descriptor_t *get_descriptor(dc_family_t type, unsigned int model)
dc_descriptor_t *ostc_get_data_descriptor(int data_model, dc_family_t data_fam)
{ {
dc_descriptor_t *descriptor = NULL, *current = NULL; dc_descriptor_t *descriptor = NULL, *needle = NULL;
;
dc_iterator_t *iterator = NULL; dc_iterator_t *iterator = NULL;
dc_status_t rc; dc_status_t rc;
rc = dc_descriptor_iterator(&iterator); rc = dc_descriptor_iterator(&iterator);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
fprintf(stderr, "Error creating the device descriptor iterator.\n"); fprintf(stderr, "Error creating the device descriptor iterator.\n");
return current; return NULL;
} }
while ((dc_iterator_next(iterator, &descriptor)) == DC_STATUS_SUCCESS) { while ((dc_iterator_next(iterator, &descriptor)) == DC_STATUS_SUCCESS) {
int desc_model = dc_descriptor_get_model(descriptor); unsigned int desc_model = dc_descriptor_get_model(descriptor);
dc_family_t desc_fam = dc_descriptor_get_type(descriptor); dc_family_t desc_type = dc_descriptor_get_type(descriptor);
if (data_model == desc_model && data_fam == desc_fam) { if (model == desc_model && type == desc_type) {
current = descriptor; needle = descriptor;
break; break;
} }
dc_descriptor_free(descriptor); dc_descriptor_free(descriptor);
} }
dc_iterator_free(iterator); dc_iterator_free(iterator);
return current; return needle;
} }

2
core/libdivecomputer.h
View file

@ -52,7 +52,7 @@ const char *do_libdivecomputer_import(device_data_t *data);
const char *do_uemis_import(device_data_t *data); const char *do_uemis_import(device_data_t *data);
dc_status_t libdc_buffer_parser(struct dive *dive, device_data_t *data, unsigned char *buffer, int size); dc_status_t libdc_buffer_parser(struct dive *dive, device_data_t *data, unsigned char *buffer, int size);
void logfunc(dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata); void logfunc(dc_context_t *context, dc_loglevel_t loglevel, const char *file, unsigned int line, const char *function, const char *msg, void *userdata);
dc_descriptor_t *ostc_get_data_descriptor(int data_model, dc_family_t data_fam); dc_descriptor_t *get_descriptor(dc_family_t type, unsigned int model);
extern int import_thread_cancelled; extern int import_thread_cancelled;
extern const char *progress_bar_text; extern const char *progress_bar_text;

2
core/ostctools.c
View file

@ -17,7 +17,7 @@ static int ostc_prepare_data(int data_model, dc_family_t dc_fam, device_data_t *
dev_data->device = NULL; dev_data->device = NULL;
dev_data->context = NULL; dev_data->context = NULL;
data_descriptor = ostc_get_data_descriptor(data_model, dc_fam); data_descriptor = get_descriptor(data_model, dc_fam);
if (data_descriptor) { if (data_descriptor) {
dev_data->descriptor = data_descriptor; dev_data->descriptor = data_descriptor;
dev_data->vendor = copy_string(data_descriptor->vendor); dev_data->vendor = copy_string(data_descriptor->vendor);