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

Make add_dc_to_string() skip redundant entries

Browse source 
There is no point writing out divecomputer nicknames that do not exist
(or that match the dive computer model), so don't.

Also, make the function to do this static to save-xml.c, which is the
only user (I initially didn't _find_ the function to create the XML
string because it was illogically hidden in gtk-gui.c), and change the
calling convention to be more direct (pass in a string and return a
result, rather than modify a "pointer to string").

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Linus Torvalds 2012-12-28 08:38:47 -08:00 • committed by Dirk Hohndel
parent fc1bb0a32c
commit 3b136f23ee
3 changed files with 33 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -530,7 +530,6 @@ extern void flush_divelist(struct dive *dive);
extern void set_dc_nickname(struct dive *dive);
extern const char *get_dc_nickname(const char *model, uint32_t deviceid);
extern void remember_dc(const char *model, uint32_t deviceid, const char *nickname, gboolean change_conf);
extern void add_dc_to_string(char **dc_xml, struct divecomputer *dc);
#define DIVE_ERROR_PARSE 1

34
gtk-gui.c
View file

@ -2281,37 +2281,3 @@ void set_dc_nickname(struct dive *dive)
dc = dc->next;
}
}
void add_dc_to_string(char **dc_xml, struct divecomputer *dc)
{
char *pattern, *tmp;
const char *nickname;
int len;
if (!dc || !dc->model || !*dc->model || !dc->deviceid)
/* we have no dc or no model or no deviceid information... nothing to do here */
return;
len = sizeof(" model='' deviceid=''") + strlen(dc->model) + 8;
pattern = malloc(len);
snprintf(pattern, len, " model='%s' deviceid='%08x'", dc->model, dc->deviceid);
if (*dc_xml && strstr(*dc_xml, pattern)) {
/* already have that one */
free(pattern);
return;
}
nickname = get_dc_nickname(dc->model, dc->deviceid);
if (!nickname || !*nickname || !strcmp(dc->model, nickname)) {
/* we still want to store this entry as it explicitly tells us
* "no nickname needed, use model" */
len += strlen(*dc_xml) + sizeof("<divecomputerid/>\n");
tmp = malloc(len);
snprintf(tmp, len, "%s<divecomputerid%s/>\n", *dc_xml, pattern);
} else {
len += strlen(*dc_xml) + strlen(nickname) + sizeof("<divecomputerid nickname=''/>\n");
tmp = malloc(len);
snprintf(tmp, len, "%s<divecomputerid%s nickname='%s'/>\n", *dc_xml, pattern, nickname);
}
free(pattern);
free(*dc_xml);
*dc_xml = tmp;
}

34
save-xml.c
View file

@ -443,6 +443,38 @@ static void save_dive(FILE *f, struct dive *dive)
fprintf(f, "</dive>\n");
}
static char *add_dc_to_string(char *dc_xml, struct divecomputer *dc)
{
char *pattern, *tmp;
const char *nickname;
int len;
/* we have no dc or no model or no deviceid information... nothing to do here */
if (!dc || !dc->model || !*dc->model || !dc->deviceid)
return dc_xml;
nickname = get_dc_nickname(dc->model, dc->deviceid);
/* We have no nickname, or it is the same as the model ID - nothing interesting */
if (!nickname || !*nickname || !strcmp(dc->model, nickname))
return dc_xml;
len = sizeof(" model='' deviceid=''") + strlen(dc->model) + 8;
pattern = malloc(len);
snprintf(pattern, len, " model='%s' deviceid='%08x'", dc->model, dc->deviceid);
if (dc_xml && strstr(dc_xml, pattern)) {
/* already have that one */
free(pattern);
return dc_xml;
}
len += strlen(dc_xml) + strlen(nickname) + sizeof("<divecomputerid nickname=''/>\n");
tmp = malloc(len);
snprintf(tmp, len, "%s<divecomputerid%s nickname='%s'/>\n", dc_xml, pattern, nickname);
free(pattern);
free(dc_xml);
return tmp;
}
#define VERSION 2
void save_dives(const char *filename)
@ -464,7 +496,7 @@ void save_dives(const char *filename)
for_each_dive(i, dive) {
struct divecomputer *dc = &dive->dc;
while (dc) {
add_dc_to_string(&dc_xml, dc);
dc_xml = add_dc_to_string(dc_xml, dc);
dc = dc->next;
}
}