From 19dc25fa7c9d00790265ad16981c4d40eb9fe417 Mon Sep 17 00:00:00 2001
From: Josh Davies <jodavies@users.noreply.github.com>
Date: Tue, 26 Nov 2024 09:49:14 +0000
Subject: [PATCH] Better warnings for resized sub-buffers in DEBUGGING mode

Add a function argument to AllocSort to specify which buffers are
being allocated. This makes it straightforward to print an appropriate
warning message.
---
 sources/declare.h |  2 +-
 sources/setfile.c | 18 ++++++++++++------
 sources/sort.c    |  2 +-
 sources/threads.c |  3 ++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/sources/declare.h b/sources/declare.h
index af21b923..da8587bd 100644
--- a/sources/declare.h
+++ b/sources/declare.h
@@ -876,7 +876,7 @@ extern int    ToFast(WORD *,WORD *);
 extern SETUPPARAMETERS *GetSetupPar(UBYTE *);
 extern int    RecalcSetups(VOID);
 extern int    AllocSetups(VOID);
-extern SORTING *AllocSort(LONG,LONG,LONG,LONG,int,int,LONG);
+extern SORTING *AllocSort(LONG,LONG,LONG,LONG,int,int,LONG,int);
 extern VOID   AllocSortFileName(SORTING *);
 extern UBYTE *LoadInputFile(UBYTE *,int);
 extern UBYTE  GetInput(VOID);
diff --git a/sources/setfile.c b/sources/setfile.c
index cbdcdda0..9cc39428 100644
--- a/sources/setfile.c
+++ b/sources/setfile.c
@@ -573,7 +573,7 @@ int AllocSetups(VOID)
 #endif
 	AM.S0 = 0;
 	AM.S0 = AllocSort(LargeSize,SmallSize,SmallEsize,TermsInSmall
-					,MaxPatches,MaxFpatches,IOsize);
+					,MaxPatches,MaxFpatches,IOsize,0);
 	/* AM.S0->file.ziosize was already set to a (larger) value by AllocSort, here it is re-set. */
 #ifdef WITHZLIB
 	AM.S0->file.ziosize = IOsize;
@@ -848,9 +848,12 @@ VOID WriteSetup(VOID)
 		Routine allocates a complete struct for sorting.
 		To be used for the main allocation of the sort buffers, and
 		in a later stage for the function and subroutine sort buffers.
+		The level arg denotes a main buffer allocation (0) or a sub-buffer
+		allocation (1), used only for printing warning messages for buffer
+		size adjustments in DEBUGGING mode.
 */
 SORTING *AllocSort(LONG inLargeSize, LONG inSmallSize, LONG inSmallEsize, LONG inTermsInSmall,
-                   int inMaxPatches, int inMaxFpatches, LONG inIOsize)
+                   int inMaxPatches, int inMaxFpatches, LONG inIOsize, int level)
 {
 	LONG LargeSize = inLargeSize;
 	LONG SmallSize = inSmallSize;
@@ -911,10 +914,13 @@ SORTING *AllocSort(LONG inLargeSize, LONG inSmallSize, LONG inSmallEsize, LONG i
 	}
 
 #if DEBUGGING
-	if ( LargeSize != inLargeSize ) { MesPrint("Warning: LargeSize adjusted: %l -> %l", inLargeSize, LargeSize); }
-	if ( SmallSize != inSmallSize ) { MesPrint("Warning: SmallSize adjusted: %l -> %l", inSmallSize, SmallSize); }
-	if ( SmallEsize != inSmallEsize ) {MesPrint("Warning: SmallEsize adjusted: %l -> %l", inSmallEsize, SmallEsize); }
-	if ( TermsInSmall != inTermsInSmall ) { MesPrint("Warning: TermsInSmall adjusted: %l -> %l", inTermsInSmall, TermsInSmall); }
+	char *prefix;
+	if ( level == 0 ) { prefix = ""; }
+	else { prefix = "Sub"; }
+	if ( LargeSize != inLargeSize ) { MesPrint("Warning: %sLargeSize adjusted: %l -> %l", prefix, inLargeSize, LargeSize); }
+	if ( SmallSize != inSmallSize ) { MesPrint("Warning: %sSmallSize adjusted: %l -> %l", prefix, inSmallSize, SmallSize); }
+	if ( SmallEsize != inSmallEsize ) {MesPrint("Warning: %sSmallEsize adjusted: %l -> %l", prefix, inSmallEsize, SmallEsize); }
+	if ( TermsInSmall != inTermsInSmall ) { MesPrint("Warning: %sTermsInSmall adjusted: %l -> %l", prefix, inTermsInSmall, TermsInSmall); }
 	if ( MaxPatches != inMaxPatches ) { MesPrint("Warning: MaxPatches adjusted: %d -> %d", inMaxPatches, MaxPatches); }
 	if ( MaxFpatches != inMaxFpatches ) {MesPrint("Warning: MaxFPatches adjusted: %d -> %d", inMaxFpatches, MaxFpatches); }
 	/* This one is always changed if the LargeSize has not been... */
diff --git a/sources/sort.c b/sources/sort.c
index aa29571e..17a48df0 100644
--- a/sources/sort.c
+++ b/sources/sort.c
@@ -646,7 +646,7 @@ WORD NewSort(PHEAD0)
 		if ( AN.FunSorts[AR.sLevel] == 0 ) {
 			AN.FunSorts[AR.sLevel] = AllocSort(
 				AM.SLargeSize,AM.SSmallSize,AM.SSmallEsize,AM.STermsInSmall
-					,AM.SMaxPatches,AM.SMaxFpatches,AM.SIOsize);
+					,AM.SMaxPatches,AM.SMaxFpatches,AM.SIOsize,1);
 		}
 		AN.FunSorts[AR.sLevel]->PolyFlag = 0;
 	}
diff --git a/sources/threads.c b/sources/threads.c
index 89bf4f0f..59410a3c 100644
--- a/sources/threads.c
+++ b/sources/threads.c
@@ -737,7 +737,8 @@ ALLPRIVATES *InitializeOneThread(int identity)
 						 ,AM.S0->MaxPatches
 /*						 ,AM.S0->MaxPatches/numberofworkers  */
 						 ,AM.S0->MaxFpatches/numberofworkers
-						 ,AM.S0->file.POsize);
+						 ,AM.S0->file.POsize
+						 ,0);
 	}
 	AR.CompressPointer = AR.CompressBuffer;
 /*