FlapJackApps/libdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove 'serial' number from descriptor array

Browse Source 
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 <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2018-03-11 11:59:40 -07:00
parent f5e10ff9bc
commit f4e43afad9
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libdivecomputer/descriptor.h
View File

@ -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);

10
src/descriptor.c
View File

@ -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)
{

2
src/parser.c
View File

@ -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);
}