clang dislikes sizeof a non-static member from an external scope?

bbbradsmith · Apr 26, 2024 · c759a51 · c759a51
1 parent 3b3ea96
commit c759a51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/core/core.h b/core/core.h
@@ -67,7 +67,8 @@ typedef struct NSFCore_
 	mutable const char* error_last;
 	mutable sint32 error_last_code;
 	mutable char error_last_buffer[256]; // error_last may point to this for formatted errors
-	mutable char temp_text[1024]; // used for returned text information
+	static const int TEMP_TEXT_SIZE = 1024;
+	mutable char temp_text[TEMP_TEXT_SIZE]; // used for returned text information
 	mutable const uint8* active_prop_lines;
 	mutable uint32 active_prop_lines_len;
 

diff --git a/core/nsf.cpp b/core/nsf.cpp
@@ -633,8 +633,6 @@ const char* NSFCore::prop_str(sint32 prop, sint32 song) const
 	return MISSING_STR;
 }
 
-const uint32 MAX_PROP_LINE_WIDTH = (sizeof(NSFCore::temp_text)/sizeof(NSFCore::temp_text[0])) - 1;
-
 sint32 NSFCore::prop_lines(sint32 prop, sint32 song) const
 {
 	PROPSETUP();
@@ -674,7 +672,7 @@ sint32 NSFCore::prop_lines(sint32 prop, sint32 song) const
 			else
 			{
 				++line_width;
-				if (line_width >= MAX_PROP_LINE_WIDTH) // break lines too long for temp_text
+				if (line_width >= (TEMP_TEXT_SIZE-1)) // break lines too long for temp_text
 				{
 					++lines;
 					line_width = 0;
@@ -712,7 +710,7 @@ const char* NSFCore::prop_line() const
 		{
 			temp_text[line_width] = c;
 			++line_width;
-			if (line_width >= MAX_PROP_LINE_WIDTH) break;
+			if (line_width >= (TEMP_TEXT_SIZE-1)) break;
 		}
 	}
 	temp_text[line_width] = 0;