From c5f089b4a6502949160c1114a201a22b54623e71 Mon Sep 17 00:00:00 2001 From: Jef Driesen Date: Thu, 13 Apr 2017 13:39:30 +0200 Subject: [PATCH] Remove unnecessary helper functions The second variant of the open or create functions were introduced to maintain backwards compatibility. But after being removed from the public api, these functions serve no purpose anymore, and can be removed completely. --- src/cressi_leonardo.h | 5 +---- src/cressi_leonardo_parser.c | 9 +-------- src/device.c | 6 +++--- src/divesystem_idive.c | 9 +-------- src/divesystem_idive.h | 10 ++-------- src/divesystem_idive_parser.c | 9 +-------- src/oceanic_atom2.c | 9 +-------- src/oceanic_atom2.h | 5 +---- src/oceanic_vtpro.c | 9 +-------- src/oceanic_vtpro.h | 10 ++-------- src/oceanic_vtpro_parser.c | 9 +-------- src/parser.c | 6 +++--- 12 files changed, 18 insertions(+), 78 deletions(-) diff --git a/src/cressi_leonardo.h b/src/cressi_leonardo.h index df246a1..043cd5f 100644 --- a/src/cressi_leonardo.h +++ b/src/cressi_leonardo.h @@ -37,10 +37,7 @@ dc_status_t cressi_leonardo_extract_dives (dc_device_t *abstract, const unsigned char data[], unsigned int size, dc_dive_callback_t callback, void *userdata); dc_status_t -cressi_leonardo_parser_create (dc_parser_t **parser, dc_context_t *context); - -dc_status_t -cressi_leonardo_parser_create2 (dc_parser_t **parser, dc_context_t *context, unsigned int model); +cressi_leonardo_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model); #ifdef __cplusplus } diff --git a/src/cressi_leonardo_parser.c b/src/cressi_leonardo_parser.c index 3e0d1e4..6032376 100644 --- a/src/cressi_leonardo_parser.c +++ b/src/cressi_leonardo_parser.c @@ -56,7 +56,7 @@ static const dc_parser_vtable_t cressi_leonardo_parser_vtable = { dc_status_t -cressi_leonardo_parser_create2 (dc_parser_t **out, dc_context_t *context, unsigned int model) +cressi_leonardo_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int model) { cressi_leonardo_parser_t *parser = NULL; @@ -78,13 +78,6 @@ cressi_leonardo_parser_create2 (dc_parser_t **out, dc_context_t *context, unsign } -dc_status_t -cressi_leonardo_parser_create (dc_parser_t **parser, dc_context_t *context) -{ - return cressi_leonardo_parser_create2 (parser, context, 0); -} - - static dc_status_t cressi_leonardo_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size) { diff --git a/src/device.c b/src/device.c index f32f8d2..2fbcc30 100644 --- a/src/device.c +++ b/src/device.c @@ -148,13 +148,13 @@ dc_device_open (dc_device_t **out, dc_context_t *context, dc_descriptor_t *descr rc = reefnet_sensusultra_device_open (&device, context, name); break; case DC_FAMILY_OCEANIC_VTPRO: - rc = oceanic_vtpro_device_open2 (&device, context, name, dc_descriptor_get_model (descriptor)); + rc = oceanic_vtpro_device_open (&device, context, name, dc_descriptor_get_model (descriptor)); break; case DC_FAMILY_OCEANIC_VEO250: rc = oceanic_veo250_device_open (&device, context, name); break; case DC_FAMILY_OCEANIC_ATOM2: - rc = oceanic_atom2_device_open2 (&device, context, name, dc_descriptor_get_model (descriptor)); + rc = oceanic_atom2_device_open (&device, context, name, dc_descriptor_get_model (descriptor)); break; case DC_FAMILY_MARES_NEMO: rc = mares_nemo_device_open (&device, context, name); @@ -202,7 +202,7 @@ dc_device_open (dc_device_t **out, dc_context_t *context, dc_descriptor_t *descr rc = citizen_aqualand_device_open (&device, context, name); break; case DC_FAMILY_DIVESYSTEM_IDIVE: - rc = divesystem_idive_device_open2 (&device, context, name, dc_descriptor_get_model (descriptor)); + rc = divesystem_idive_device_open (&device, context, name, dc_descriptor_get_model (descriptor)); break; case DC_FAMILY_COCHRAN_COMMANDER: rc = cochran_commander_device_open (&device, context, name); diff --git a/src/divesystem_idive.c b/src/divesystem_idive.c index 759f657..d8c02e8 100644 --- a/src/divesystem_idive.c +++ b/src/divesystem_idive.c @@ -96,14 +96,7 @@ static const divesystem_idive_commands_t ix3m = { }; dc_status_t -divesystem_idive_device_open (dc_device_t **out, dc_context_t *context, const char *name) -{ - return divesystem_idive_device_open2 (out, context, name, 0); -} - - -dc_status_t -divesystem_idive_device_open2 (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model) +divesystem_idive_device_open (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model) { dc_status_t status = DC_STATUS_SUCCESS; divesystem_idive_device_t *device = NULL; diff --git a/src/divesystem_idive.h b/src/divesystem_idive.h index 015f44e..20ed729 100644 --- a/src/divesystem_idive.h +++ b/src/divesystem_idive.h @@ -31,16 +31,10 @@ extern "C" { #endif /* __cplusplus */ dc_status_t -divesystem_idive_device_open (dc_device_t **device, dc_context_t *context, const char *name); +divesystem_idive_device_open (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model); dc_status_t -divesystem_idive_device_open2 (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model); - -dc_status_t -divesystem_idive_parser_create (dc_parser_t **parser, dc_context_t *context); - -dc_status_t -divesystem_idive_parser_create2 (dc_parser_t **parser, dc_context_t *context, unsigned int model); +divesystem_idive_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model); #ifdef __cplusplus } diff --git a/src/divesystem_idive_parser.c b/src/divesystem_idive_parser.c index 0b40945..968765c 100644 --- a/src/divesystem_idive_parser.c +++ b/src/divesystem_idive_parser.c @@ -82,14 +82,7 @@ static const dc_parser_vtable_t divesystem_idive_parser_vtable = { dc_status_t -divesystem_idive_parser_create (dc_parser_t **out, dc_context_t *context) -{ - return divesystem_idive_parser_create2 (out, context, 0); -} - - -dc_status_t -divesystem_idive_parser_create2 (dc_parser_t **out, dc_context_t *context, unsigned int model) +divesystem_idive_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int model) { divesystem_idive_parser_t *parser = NULL; diff --git a/src/oceanic_atom2.c b/src/oceanic_atom2.c index 6c5fe67..cccfc4e 100644 --- a/src/oceanic_atom2.c +++ b/src/oceanic_atom2.c @@ -555,14 +555,7 @@ oceanic_atom2_quit (oceanic_atom2_device_t *device) dc_status_t -oceanic_atom2_device_open (dc_device_t **out, dc_context_t *context, const char *name) -{ - return oceanic_atom2_device_open2 (out, context, name, 0); -} - - -dc_status_t -oceanic_atom2_device_open2 (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model) +oceanic_atom2_device_open (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model) { dc_status_t status = DC_STATUS_SUCCESS; oceanic_atom2_device_t *device = NULL; diff --git a/src/oceanic_atom2.h b/src/oceanic_atom2.h index ee0f657..cee2306 100644 --- a/src/oceanic_atom2.h +++ b/src/oceanic_atom2.h @@ -33,10 +33,7 @@ extern "C" { #endif /* __cplusplus */ dc_status_t -oceanic_atom2_device_open (dc_device_t **device, dc_context_t *context, const char *name); - -dc_status_t -oceanic_atom2_device_open2 (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model); +oceanic_atom2_device_open (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model); dc_status_t oceanic_atom2_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model); diff --git a/src/oceanic_vtpro.c b/src/oceanic_vtpro.c index c16f600..2e86f5f 100644 --- a/src/oceanic_vtpro.c +++ b/src/oceanic_vtpro.c @@ -384,14 +384,7 @@ oceanic_vtpro_device_logbook (dc_device_t *abstract, dc_event_progress_t *progre } dc_status_t -oceanic_vtpro_device_open (dc_device_t **out, dc_context_t *context, const char *name) -{ - return oceanic_vtpro_device_open2 (out, context, name, 0); -} - - -dc_status_t -oceanic_vtpro_device_open2 (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model) +oceanic_vtpro_device_open (dc_device_t **out, dc_context_t *context, const char *name, unsigned int model) { dc_status_t status = DC_STATUS_SUCCESS; oceanic_vtpro_device_t *device = NULL; diff --git a/src/oceanic_vtpro.h b/src/oceanic_vtpro.h index 6beef68..9689818 100644 --- a/src/oceanic_vtpro.h +++ b/src/oceanic_vtpro.h @@ -33,16 +33,10 @@ extern "C" { #endif /* __cplusplus */ dc_status_t -oceanic_vtpro_device_open (dc_device_t **device, dc_context_t *context, const char *name); +oceanic_vtpro_device_open (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model); dc_status_t -oceanic_vtpro_device_open2 (dc_device_t **device, dc_context_t *context, const char *name, unsigned int model); - -dc_status_t -oceanic_vtpro_parser_create (dc_parser_t **parser, dc_context_t *context); - -dc_status_t -oceanic_vtpro_parser_create2 (dc_parser_t **parser, dc_context_t *context, unsigned int model); +oceanic_vtpro_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model); #ifdef __cplusplus } diff --git a/src/oceanic_vtpro_parser.c b/src/oceanic_vtpro_parser.c index 822f22e..9c85854 100644 --- a/src/oceanic_vtpro_parser.c +++ b/src/oceanic_vtpro_parser.c @@ -61,14 +61,7 @@ static const dc_parser_vtable_t oceanic_vtpro_parser_vtable = { dc_status_t -oceanic_vtpro_parser_create (dc_parser_t **out, dc_context_t *context) -{ - return oceanic_vtpro_parser_create2 (out, context, 0); -} - - -dc_status_t -oceanic_vtpro_parser_create2 (dc_parser_t **out, dc_context_t *context, unsigned int model) +oceanic_vtpro_parser_create (dc_parser_t **out, dc_context_t *context, unsigned int model) { oceanic_vtpro_parser_t *parser = NULL; diff --git a/src/parser.c b/src/parser.c index 1b1e314..98d2c89 100644 --- a/src/parser.c +++ b/src/parser.c @@ -110,7 +110,7 @@ dc_parser_new_internal (dc_parser_t **out, dc_context_t *context, dc_family_t fa rc = reefnet_sensusultra_parser_create (&parser, context, devtime, systime); break; case DC_FAMILY_OCEANIC_VTPRO: - rc = oceanic_vtpro_parser_create2 (&parser, context, model); + rc = oceanic_vtpro_parser_create (&parser, context, model); break; case DC_FAMILY_OCEANIC_VEO250: rc = oceanic_veo250_parser_create (&parser, context, model); @@ -143,7 +143,7 @@ dc_parser_new_internal (dc_parser_t **out, dc_context_t *context, dc_family_t fa rc = cressi_edy_parser_create (&parser, context, model); break; case DC_FAMILY_CRESSI_LEONARDO: - rc = cressi_leonardo_parser_create2 (&parser, context, model); + rc = cressi_leonardo_parser_create (&parser, context, model); break; case DC_FAMILY_ATOMICS_COBALT: rc = atomics_cobalt_parser_create (&parser, context); @@ -161,7 +161,7 @@ dc_parser_new_internal (dc_parser_t **out, dc_context_t *context, dc_family_t fa rc = citizen_aqualand_parser_create (&parser, context); break; case DC_FAMILY_DIVESYSTEM_IDIVE: - rc = divesystem_idive_parser_create2 (&parser, context, model); + rc = divesystem_idive_parser_create (&parser, context, model); break; case DC_FAMILY_COCHRAN_COMMANDER: rc = cochran_commander_parser_create (&parser, context, model);