diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-06-18 00:33:03 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-06-18 00:33:03 -0700 |
| commit | 0773172f66ef3cd73a88e3297c8b5ae28cfe2a8f (patch) | |
| tree | f0afadcacdb22dfe4781cd9891a95c302edcfcb6 /parse-xml.c | |
| parent | 87e380c7a28b467705b470323275db3812e0fa90 (diff) | |
| parent | 29b242c70349cbd67aacc3e4f1206630d22c54eb (diff) | |
| download | subsurface-0773172f66ef3cd73a88e3297c8b5ae28cfe2a8f.tar.gz | |
Merge branch 'qtHelper'
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'parse-xml.c')
| -rw-r--r-- | parse-xml.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/parse-xml.c b/parse-xml.c index ba952957f..aa2f737ec 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -1222,17 +1222,8 @@ static void dc_settings_start(void) static void dc_settings_end(void) { - struct device_info *info; - - info = create_device_info(cur_settings.dc.model, cur_settings.dc.deviceid); - if (info) { - if (!info->serial_nr && cur_settings.dc.serial_nr) - info->serial_nr = strdup(cur_settings.dc.serial_nr); - if (!info->firmware && cur_settings.dc.firmware) - info->firmware = strdup(cur_settings.dc.firmware); - if (!info->nickname && cur_settings.dc.nickname) - info->nickname = strdup(cur_settings.dc.nickname); - } + create_device_node(cur_settings.dc.model, cur_settings.dc.deviceid, cur_settings.dc.serial_nr, + cur_settings.dc.firmware, cur_settings.dc.nickname); reset_dc_settings(); } |