NIckname bug (was Re: [PATCH] Allow overlapping (and disjoint) dive trips)

[Dirk Hohndel]

Linus Torvalds <torvalds at linux-foundation.org> writes:
> Btw, testing this did show a bug in nickname handling.
>
> The combined dive data had two different Uemis Zurich dive computers,
> so subsurface nicely asked for a nickname of the second one. The
> logical nickname was "Dirk's Uemis".
>
> But the nickname saving doesn't do the proper quoting of this, so the
> end result is not valid XML, so when you save the thing (as
> "combined.xml") to verify that everything looks good, re-loading the
> result doesn't work.

Err. OOops.

> Dirk, please just print the dive computer list directly in save-xml,
> and use the show_utf8() function, instead of doing the "generate one
> long string" thing.  Add a flag to the nickname entry of whether it
> has been saved or not, and get rid of the strstr(), or something.

I did that and I think the resulting code is much nicer. It's pushed
out, please take a look and test.

/D