Better error "Sorted function argument too long"

Print the required MaxTermSize in words to allow easy configuration of setup.
vermaseren · Aug 12, 2018 · 6ca4aca · 6ca4aca
1 parent e8c9798
commit 6ca4aca
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/sources/sort.c b/sources/sort.c
@@ -780,8 +780,13 @@ LONG EndSort(PHEAD WORD *buffer, int par)
 				while ( ( t = *ss++ ) != 0 ) {
 					j = *t;
 					if ( ( sSpace += j ) > AM.MaxTer/((LONG)sizeof(WORD)) ) {
+						/* Too big! Get the total size for useful error message */
+						while ( ( t = *ss++ ) != 0 ) {
+							sSpace += *t;
+						}
 						MLOCK(ErrorMessageLock);
-						MesPrint("Sorted function argument too long.");
+						MesPrint("Sorted function argument too long: %d words", sSpace);
+						MesPrint("MaxTermSize: %d words", AM.MaxTer/((LONG)sizeof(WORD)) );
 						MUNLOCK(ErrorMessageLock);
 						retval = -1; goto RetRetval;
 					}

diff --git a/sources/tools.c b/sources/tools.c
@@ -2252,6 +2252,7 @@ VOID *Malloc1(LONG size, const char *messageifwrong)
 #ifndef MALLOCDEBUG
 		MLOCK(ErrorMessageLock);
 #endif
+		MesPrint("Attempted to allocate %l bytes.", size);
 		Error1("No memory while allocating ",(UBYTE *)messageifwrong);
 #ifndef MALLOCDEBUG
 		MUNLOCK(ErrorMessageLock);