Picture handling: cleaning up the mess

We had pointers to data structures on the stack which we frequently
reallocated. These data structure contain basically a filename and an
offset. We then create a hash of the pointers to those datastructures with
the filename being the key. And then we passed those pointers around
through a Qt model(!!!) only in order to then later look up by filename
what the offset might be.

I am at a loss for words for the lunacy behind this design.

How about we just remember the offsets and pass the integers around?

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-08-05 12:37:14 -07:00
parent 3adbff2320
commit 4583cd8e09
5 changed files with 10 additions and 11 deletions

4
dive.c
View file

@ -2495,10 +2495,10 @@ static void picture_free( struct picture *p){
free( p->filename );
free( p );
}
void dive_remove_picture(struct picture *p)
void dive_remove_picture(char *filename)
{
struct picture **ep = &current_dive->picture_list;
while (ep && !same_string((*ep)->filename, p->filename))
while (ep && !same_string((*ep)->filename, filename))
ep = &(*ep)->next;
if (ep) {
struct picture *temp = (*ep)->next;