From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 24 May 2025 17:41:30 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Url: https://git.tuebingen.mpg.de/?a=commitdiff_plain;h=f144439bf20d57ce3d8faffcfc7c1256d788357e;p=paraslash.git

Merge branch 'master' into next

* master:
  aft: Pass correct afsi argument to AFSI_CHANGE event handlers.
---

f144439bf20d57ce3d8faffcfc7c1256d788357e
diff --cc aft.c
index a9145f2c,383439d0..a19933dd
--- a/aft.c
+++ b/aft.c
@@@ -1041,9 -1041,9 +1041,9 @@@ out
   */
  int open_and_update_audio_file(int *fd)
  {
 -	unsigned char file_hash[HASH2_SIZE];
 +	unsigned char file_hash[HASH_SIZE];
  	struct osl_object afsi_obj;
- 	struct afs_info new_afsi;
+ 	struct afs_info old_afsi;
  	int ret;
  	struct afsi_change_event_data aced;
  	struct osl_object map, chunk_table_obj;