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

One more merge fix

Browse Source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-02-28 06:34:57 +01:00
parent 7c33c633fb
commit 55a44a73bb
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/shearwater_petrel.c
View File

@ -128,9 +128,6 @@ shearwater_petrel_device_custom_open (dc_device_t **out, dc_context_t *context,
return DC_STATUS_NOMEMORY; return DC_STATUS_NOMEMORY;
} }
// Initialize the base class.
device_init (&device->base.base, context, &shearwater_petrel_device_vtable);
// Set the default values. // Set the default values.
memset (device->fingerprint, 0, sizeof (device->fingerprint)); memset (device->fingerprint, 0, sizeof (device->fingerprint));

3
src/shearwater_predator.c
View File

@ -114,9 +114,6 @@ shearwater_predator_device_custom_open (dc_device_t **out, dc_context_t *context
return DC_STATUS_NOMEMORY; return DC_STATUS_NOMEMORY;
} }
// Initialize the base class.
device_init (&device->base.base, context, &shearwater_predator_device_vtable);
// Set the default values. // Set the default values.
memset (device->fingerprint, 0, sizeof (device->fingerprint)); memset (device->fingerprint, 0, sizeof (device->fingerprint));

2
src/shearwater_predator_parser.c
View File

@ -139,10 +139,8 @@ shearwater_common_parser_create (dc_parser_t **out, dc_context_t *context, unsig
parser->petrel = petrel; parser->petrel = petrel;
parser->serial = serial; parser->serial = serial;
if (petrel) { if (petrel) {
parser_init (&parser->base, context, &shearwater_petrel_parser_vtable);
parser->samplesize = SZ_SAMPLE_PETREL; parser->samplesize = SZ_SAMPLE_PETREL;
} else { } else {
parser_init (&parser->base, context, &shearwater_predator_parser_vtable);
parser->samplesize = SZ_SAMPLE_PREDATOR; parser->samplesize = SZ_SAMPLE_PREDATOR;
} }