summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-10-17 13:28:05 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-10-17 09:04:20 -0700
commitc0467422888602b53d673d49a955d1d878cb24d5 (patch)
tree16c431b0e604281833c66c5cb314b37983490a55 /core
parentad608e48f5759059c3115f566078ff3fca350252 (diff)
downloadsubsurface-c0467422888602b53d673d49a955d1d878cb24d5.tar.gz
cleanup: rename clear_device_nodes() to clear_device_table()
For consistency with all the other clear_*_table functions (dive, trip, dive_site, ...) Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core')
-rw-r--r--core/device.cpp2
-rw-r--r--core/device.h2
-rw-r--r--core/divelist.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/device.cpp b/core/device.cpp
index c35aa74e9..1e8e0792c 100644
--- a/core/device.cpp
+++ b/core/device.cpp
@@ -285,7 +285,7 @@ extern "C" void create_device_node(struct device_table *device_table, const char
addDC(device_table->devices, model ?: "", deviceid, nickname ?: "", serial ?: "", firmware ?: "");
}
-extern "C" void clear_device_nodes(struct device_table *device_table)
+extern "C" void clear_device_table(struct device_table *device_table)
{
device_table->devices.clear();
}
diff --git a/core/device.h b/core/device.h
index b9729cdcc..f3bb1e097 100644
--- a/core/device.h
+++ b/core/device.h
@@ -23,7 +23,7 @@ extern void set_dc_nickname(struct dive *dive, struct device_table *table);
extern void create_device_node(struct device_table *table, const char *model, uint32_t deviceid, const char *serial, const char *firmware, const char *nickname);
extern int nr_devices(const struct device_table *table);
extern const struct device *get_device(const struct device_table *table, int i);
-extern void clear_device_nodes(struct device_table *table);
+extern void clear_device_table(struct device_table *table);
const char *get_dc_nickname(const struct divecomputer *dc);
extern bool device_used_by_selected_dive(const struct device *dev);
diff --git a/core/divelist.c b/core/divelist.c
index c76ec7b25..5a47e3c44 100644
--- a/core/divelist.c
+++ b/core/divelist.c
@@ -1376,7 +1376,7 @@ void clear_dive_file_data()
}
clear_dive(&displayed_dive);
- clear_device_nodes(&device_table);
+ clear_device_table(&device_table);
clear_events();
clear_filter_presets();