diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2012-12-21 20:00:20 -0800 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2012-12-21 20:58:47 -0800 |
commit | 8d2abc05f60cb9a5ec79db9a215fe8aa97e0c311 (patch) | |
tree | 1a3d4fe6f9abc3206cdf8a115edb954842e64e29 /parse-xml.c | |
parent | eb3e879030b0a29cc3f40d8df3e3eb6f7120c9ea (diff) | |
download | subsurface-8d2abc05f60cb9a5ec79db9a215fe8aa97e0c311.tar.gz |
Remove nickname from divecomputer data structure
Having it there with the model information seemed to make sense but on
second thought it's the wrong spot to keep that information, especially
since we were storing it in the XML file in every single dive.
This change removes the nickname member from the divecomputer and makes
the rest of the code reasonably self consistent. It does not add much of
the new code for the new design to handle nicknames.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
-rw-r--r-- | parse-xml.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/parse-xml.c b/parse-xml.c index 7d9a4694d..57c4dd1cd 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -625,8 +625,6 @@ static void try_to_fill_dc(struct divecomputer *dc, const char *name, char *buf) return; if (MATCH(".model", utf8_string, &dc->model)) return; - if (MATCH(".nickname", utf8_string, &dc->nickname)) - return; if (MATCH(".deviceid", hex_value, &dc->deviceid)) return; if (MATCH(".diveid", hex_value, &dc->diveid)) |