From f4e43afad9f113a4e83e7d9f507ffe3648842fc0 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 11 Mar 2018 11:59:40 -0700 Subject: [PATCH] remove 'serial' number from descriptor array I added this long ago as a merge fixup (see commit f9db4ca97c4b: "Merge git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch"), because some of the OSTC parser_create() functions take a serial number. However, the serial number is never actually taken from the descriptor array, and if it was, it would be incorrect anyway. None of the entries in the descriptor array actually have any, so it's always zero. So just remove it, because it's a big pain whenever upstream changes the descriptor array format. Signed-off-by: Linus Torvalds --- include/libdivecomputer/descriptor.h | 3 --- src/descriptor.c | 10 ---------- src/parser.c | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/include/libdivecomputer/descriptor.h b/include/libdivecomputer/descriptor.h index 8601b0f..a78b600 100644 --- a/include/libdivecomputer/descriptor.h +++ b/include/libdivecomputer/descriptor.h @@ -58,9 +58,6 @@ dc_descriptor_get_type (dc_descriptor_t *descriptor); unsigned int dc_descriptor_get_model (dc_descriptor_t *descriptor); -unsigned int -dc_descriptor_get_serial (dc_descriptor_t *descriptor); - dc_transport_t dc_descriptor_get_transport (dc_descriptor_t *descriptor); diff --git a/src/descriptor.c b/src/descriptor.c index c549f7a..3849ea0 100644 --- a/src/descriptor.c +++ b/src/descriptor.c @@ -53,7 +53,6 @@ struct dc_descriptor_t { const char *product; dc_family_t type; unsigned int model; - unsigned int serial; }; /* @@ -436,15 +435,6 @@ dc_descriptor_get_model (dc_descriptor_t *descriptor) return descriptor->model; } -unsigned int -dc_descriptor_get_serial (dc_descriptor_t *descriptor) -{ - if (descriptor == NULL) - return 0; - - return descriptor->serial; -} - dc_transport_t dc_descriptor_get_transport (dc_descriptor_t *descriptor) { diff --git a/src/parser.c b/src/parser.c index 4e6071f..f5f55e3 100644 --- a/src/parser.c +++ b/src/parser.c @@ -195,7 +195,7 @@ dc_parser_new2 (dc_parser_t **out, dc_context_t *context, dc_descriptor_t *descr return dc_parser_new_internal (out, context, dc_descriptor_get_type (descriptor), dc_descriptor_get_model (descriptor), - dc_descriptor_get_serial (descriptor), + 0, devtime, systime); }