From bdc470a80e0260011e3dfc4d949df8f9e222f73f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 18 Feb 2018 16:22:34 +0100 Subject: Cleanup: Remove hash field from picture-structure The hash field in the picture-structure was in principle non-operational. It was set on loading, but never actually changed. The authoritative hash comes from the filename->hash map. Therefore, make this explicit by removing the hash field from the picture structure. Instead of filling the picture structure on loading, add the hash directly to the filename->hash map. This is done in the register_hash() function, which does not overwrite old entries. I.e. the local hash has priority over the save-file. This policy might be refined in the future. Signed-off-by: Berthold Stoeger --- core/dive.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'core/dive.c') diff --git a/core/dive.c b/core/dive.c index c4a903eec..9ba180c6f 100644 --- a/core/dive.c +++ b/core/dive.c @@ -455,7 +455,6 @@ static void copy_pl(struct picture *sp, struct picture *dp) { *dp = *sp; dp->filename = copy_string(sp->filename); - dp->hash = copy_string(sp->hash); } /* copy an element in a list of tags */ @@ -3804,7 +3803,6 @@ void picture_free(struct picture *picture) if (!picture) return; free(picture->filename); - free(picture->hash); free(picture); } -- cgit v1.2.3-70-g09d2