mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move device_info handling into a new 'device.c' file

Browse source 
The legacy nickname wrappers (that use the device_info structure) are
left in gtk-gui.c.  We can slowly start moving away from them, we don't
want to start exporting that thing as some kind of generic interface.

This isn't a pure code movement - because we leave the legacy interfaces
alone, there are a few new interfaces in device.c (like "create a new
device_info entry") that were embedded into the legacy "create nickname"
code, and needed to be abstracted out.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2013-01-09 12:07:09 -08:00 • committed by Dirk Hohndel
parent 33c67cc619
commit ec38d3708d
6 changed files with 135 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

94
device.c Normal file
View file

@ -0,0 +1,94 @@
#include <string.h>
#include "dive.h"
#include "device.h"
static struct device_info *device_info_list;
static int match_device_info(struct device_info *entry, const char *model, uint32_t deviceid)
{
return !strcmp(entry->model, model) && entry->deviceid == deviceid;
}
/* just find the entry for this divecomputer */
struct device_info *get_device_info(const char *model, uint32_t deviceid)
{
struct device_info *known = device_info_list;
/* a 0 deviceid doesn't get a nickname - those come from development
* versions of Subsurface that didn't store the deviceid in the divecomputer entries */
if (!deviceid || !model)
return NULL;
while (known) {
if (match_device_info(known, model, deviceid))
return known;
known = known->next;
}
return NULL;
}
/* Get an existing device info model or create a new one if valid */
struct device_info *create_device_info(const char *model, uint32_t deviceid)
{
struct device_info *entry;
if (!deviceid || !model || !*model)
return NULL;
entry = get_device_info(model, deviceid);
if (entry)
return entry;
entry = calloc(1, sizeof(*entry));
if (entry) {
entry->model = strdup(model);
entry->deviceid = deviceid;
entry->next = device_info_list;
device_info_list = entry;
}
return entry;
}
void clear_device_saved_status(void)
{
struct device_info *nn_entry = device_info_list;
while (nn_entry) {
nn_entry->saved = FALSE;
nn_entry = nn_entry->next;
}
}
/* do we have a DIFFERENT divecomputer of the same model? */
struct device_info *get_different_device_info(const char *model, uint32_t deviceid)
{
struct device_info *known = device_info_list;
/* a 0 deviceid matches any DC of the same model - those come from development
* versions of Subsurface that didn't store the deviceid in the divecomputer entries */
if (!deviceid)
return NULL;
if (!model)
model = "";
while (known) {
if (known->model && !strcmp(known->model, model) &&
known->deviceid != deviceid)
return known;
known = known->next;
}
return NULL;
}
struct device_info *remove_device_info(const char *model, uint32_t deviceid)
{
struct device_info *entry, **p;
if (!deviceid || !model || !*model)
return NULL;
p = &device_info_list;
while ((entry = *p) != NULL) {
if (match_device_info(entry, model, deviceid)) {
*p = entry->next;
break;
}
p = &entry->next;
}
return entry;
}