Remove redundant (void) parameter declarations

include/asm/charmap.hpp

@@ -10,8 +10,8 @@
 
 void charmap_New(char const *name, char const *baseName);
 void charmap_Set(char const *name);
-void charmap_Push(void);
-void charmap_Pop(void);
+void charmap_Push();
+void charmap_Pop();
 void charmap_Add(char *mapping, uint8_t value);
 bool charmap_HasChar(char const *input);
 void charmap_Convert(char const *input, std::vector<uint8_t> &output);

include/asm/fixpoint.hpp

@@ -7,8 +7,8 @@
 
 extern uint8_t fixPrecision;
 
-uint8_t fix_Precision(void);
-double fix_PrecisionFactor(void);
+uint8_t fix_Precision();
+double fix_PrecisionFactor();
 int32_t fix_Sin(int32_t i, int32_t q);
 int32_t fix_Cos(int32_t i, int32_t q);
 int32_t fix_Tan(int32_t i, int32_t q);

include/asm/format.hpp

@@ -28,7 +28,7 @@ struct FormatSpec {
 	bool valid;
 };
 
-FormatSpec fmt_NewSpec(void);
+FormatSpec fmt_NewSpec();
 bool fmt_IsEmpty(FormatSpec const *fmt);
 bool fmt_IsValid(FormatSpec const *fmt);
 bool fmt_IsFinished(FormatSpec const *fmt);

include/asm/fstack.hpp

@@ -44,10 +44,10 @@ extern size_t maxRecursionDepth;
 struct MacroArgs;
 
 void fstk_Dump(FileStackNode const *node, uint32_t lineNo);
-void fstk_DumpCurrent(void);
-FileStackNode *fstk_GetFileStack(void);
+void fstk_DumpCurrent();
+FileStackNode *fstk_GetFileStack();
 // The lifetime of the returned chars is until reaching the end of that file
-char const *fstk_GetFileName(void);
+char const *fstk_GetFileName();
 
 void fstk_AddIncludePath(char const *s);
 void fstk_SetPreIncludeFile(char const *s);
@@ -57,14 +57,14 @@ void fstk_SetPreIncludeFile(char const *s);
  */
 std::string *fstk_FindFile(char const *path);
 
-bool yywrap(void);
+bool yywrap();
 void fstk_RunInclude(char const *path);
 void fstk_RunMacro(char const *macroName, MacroArgs *args);
 void fstk_RunRept(uint32_t count, int32_t reptLineNo, char *body, size_t size);
 void fstk_RunFor(char const *symName, int32_t start, int32_t stop, int32_t step,
 		     int32_t reptLineNo, char *body, size_t size);
-void fstk_StopRept(void);
-bool fstk_Break(void);
+void fstk_StopRept();
+bool fstk_Break();
 
 void fstk_NewRecursionDepth(size_t newDepth);
 void fstk_Init(char const *mainPath, size_t maxDepth);

include/asm/lexer.hpp

@@ -122,17 +122,17 @@ bool lexer_OpenFile(LexerState &state, char const *path);
 void lexer_OpenFileView(LexerState &state, char const *path, char *buf, size_t size, uint32_t lineNo);
 void lexer_RestartRept(uint32_t lineNo);
 void lexer_CleanupState(LexerState &state);
-void lexer_Init(void);
+void lexer_Init();
 void lexer_SetMode(enum LexerMode mode);
 void lexer_ToggleStringExpansion(bool enable);
 
-uint32_t lexer_GetIFDepth(void);
-void lexer_IncIFDepth(void);
-void lexer_DecIFDepth(void);
-bool lexer_RanIFBlock(void);
-bool lexer_ReachedELSEBlock(void);
-void lexer_RunIFBlock(void);
-void lexer_ReachELSEBlock(void);
+uint32_t lexer_GetIFDepth();
+void lexer_IncIFDepth();
+void lexer_DecIFDepth();
+bool lexer_RanIFBlock();
+bool lexer_ReachedELSEBlock();
+void lexer_RunIFBlock();
+void lexer_ReachELSEBlock();
 
 struct CaptureBody {
 	uint32_t lineNo;
@@ -140,12 +140,12 @@ struct CaptureBody {
 	size_t size;
 };
 
-void lexer_CheckRecursionDepth(void);
-char const *lexer_GetFileName(void);
-uint32_t lexer_GetLineNo(void);
-uint32_t lexer_GetColNo(void);
-void lexer_DumpStringExpansions(void);
-int yylex(void);
+void lexer_CheckRecursionDepth();
+char const *lexer_GetFileName();
+uint32_t lexer_GetLineNo();
+uint32_t lexer_GetColNo();
+void lexer_DumpStringExpansions();
+int yylex();
 bool lexer_CaptureRept(CaptureBody *capture);
 bool lexer_CaptureMacroBody(CaptureBody *capture);
 

include/asm/macro.hpp

@@ -12,20 +12,20 @@
 
 struct MacroArgs;
 
-MacroArgs *macro_GetCurrentArgs(void);
-MacroArgs *macro_NewArgs(void);
+MacroArgs *macro_GetCurrentArgs();
+MacroArgs *macro_NewArgs();
 void macro_AppendArg(MacroArgs *args, char *s);
 void macro_UseNewArgs(MacroArgs *args);
 void macro_FreeArgs(MacroArgs *args);
 char const *macro_GetArg(uint32_t i);
-char const *macro_GetAllArgs(void);
+char const *macro_GetAllArgs();
 
-uint32_t macro_GetUniqueID(void);
-char const *macro_GetUniqueIDStr(void);
+uint32_t macro_GetUniqueID();
+char const *macro_GetUniqueIDStr();
 void macro_SetUniqueID(uint32_t id);
-uint32_t macro_UseNewUniqueID(void);
-uint32_t macro_UndefUniqueID(void);
+uint32_t macro_UseNewUniqueID();
+uint32_t macro_UndefUniqueID();
 void macro_ShiftCurrentArgs(int32_t count);
-uint32_t macro_NbArgs(void);
+uint32_t macro_NbArgs();
 
 #endif // RGBDS_MACRO_H

include/asm/opt.hpp

@@ -13,7 +13,7 @@ void opt_L(bool optimize);
 void opt_W(char *flag);
 void opt_Parse(char *option);
 
-void opt_Push(void);
-void opt_Pop(void);
+void opt_Push();
+void opt_Pop();
 
 #endif // RGBDS_OPT_H

include/asm/output.hpp

@@ -17,6 +17,6 @@ void out_ReplaceNode(FileStackNode *node);
 void out_SetFileName(char *s);
 void out_CreatePatch(uint32_t type, Expression const *expr, uint32_t ofs, uint32_t pcShift);
 void out_CreateAssert(enum AssertionType type, Expression const *expr, char const *message, uint32_t ofs);
-void out_WriteObject(void);
+void out_WriteObject();
 
 #endif // RGBDS_ASM_OUTPUT_H

include/asm/section.hpp

@@ -55,18 +55,18 @@ void sect_NewSection(char const *name, enum SectionType type, uint32_t org,
 		     SectionSpec const *attributes, enum SectionModifier mod);
 void sect_SetLoadSection(char const *name, enum SectionType type, uint32_t org,
 			 SectionSpec const *attributes, enum SectionModifier mod);
-void sect_EndLoadSection(void);
+void sect_EndLoadSection();
 
-Section *sect_GetSymbolSection(void);
-uint32_t sect_GetSymbolOffset(void);
-uint32_t sect_GetOutputOffset(void);
+Section *sect_GetSymbolSection();
+uint32_t sect_GetSymbolOffset();
+uint32_t sect_GetOutputOffset();
 uint32_t sect_GetAlignBytes(uint8_t alignment, uint16_t offset);
 void sect_AlignPC(uint8_t alignment, uint16_t offset);
 
-void sect_StartUnion(void);
-void sect_NextUnionMember(void);
-void sect_EndUnion(void);
-void sect_CheckUnionClosed(void);
+void sect_StartUnion();
+void sect_NextUnionMember();
+void sect_EndUnion();
+void sect_CheckUnionClosed();
 
 void sect_AbsByte(uint8_t b);
 void sect_AbsByteGroup(uint8_t const *s, size_t length);
@@ -81,9 +81,9 @@ void sect_PCRelByte(Expression *expr, uint32_t pcShift);
 void sect_BinaryFile(char const *s, int32_t startPos);
 void sect_BinaryFileSlice(char const *s, int32_t start_pos, int32_t length);
 
-void sect_EndSection(void);
-void sect_PushSection(void);
-void sect_PopSection(void);
+void sect_EndSection();
+void sect_PushSection();
+void sect_PopSection();
 
 bool sect_IsSizeKnown(Section const NONNULL(name));
 

include/asm/symbol.hpp

@@ -42,12 +42,12 @@ struct Symbol {
 	union {
 		// If sym_IsNumeric
 		int32_t value;
-		int32_t (*numCallback)(void); // If hasCallback
+		int32_t (*numCallback)(); // If hasCallback
 		// For SYM_MACRO
 		strValue macro;
 		// For SYM_EQUS
 		strValue equs;
-		char const *(*strCallback)(void); // If hasCallback
+		char const *(*strCallback)(); // If hasCallback
 	};
 
 	uint32_t ID; // ID of the symbol in the object file (-1 if none)
@@ -109,13 +109,13 @@ int32_t sym_GetValue(Symbol const *sym);
 void sym_SetExportAll(bool set);
 Symbol *sym_AddLocalLabel(char const *symName);
 Symbol *sym_AddLabel(char const *symName);
-Symbol *sym_AddAnonLabel(void);
+Symbol *sym_AddAnonLabel();
 void sym_WriteAnonLabelName(char buf[MIN_NB_ELMS(MAXSYMLEN + 1)], uint32_t ofs, bool neg);
 void sym_Export(char const *symName);
 Symbol *sym_AddEqu(char const *symName, int32_t value);
 Symbol *sym_RedefEqu(char const *symName, int32_t value);
 Symbol *sym_AddVar(char const *symName, int32_t value);
-uint32_t sym_GetPCValue(void);
+uint32_t sym_GetPCValue();
 uint32_t sym_GetConstantSymValue(Symbol const *sym);
 uint32_t sym_GetConstantValue(char const *symName);
 // Find a symbol by exact name, bypassing expansion checks
@@ -124,7 +124,7 @@ Symbol *sym_FindExactSymbol(char const *symName);
 Symbol *sym_FindScopedSymbol(char const *symName);
 // Find a scoped symbol by name; do not return `@` or `_NARG` when they have no value
 Symbol *sym_FindScopedValidSymbol(char const *symName);
-Symbol const *sym_GetPC(void);
+Symbol const *sym_GetPC();
 Symbol *sym_AddMacro(char const *symName, int32_t defLineNo, char *body, size_t size);
 Symbol *sym_Ref(char const *symName);
 Symbol *sym_AddString(char const *symName, char const *value);
@@ -133,7 +133,7 @@ void sym_Purge(std::string const &symName);
 void sym_Init(time_t now);
 
 // Functions to save and restore the current symbol scope.
-char const *sym_GetCurrentSymbolScope(void);
+char const *sym_GetCurrentSymbolScope();
 void sym_SetCurrentSymbolScope(char const *newScope);
 
 #endif // RGBDS_SYMBOL_H

include/helpers.hpp

@@ -20,7 +20,7 @@
 	#define attr_(...)
 	// This seems to generate similar code to __builtin_unreachable, despite different semantics
 	// Note that executing this is undefined behavior (declared [[noreturn]], but does return)
-	[[noreturn]] static inline void unreachable_(void) {}
+	[[noreturn]] static inline void unreachable_() {}
 #endif
 
 // Use builtins whenever possible, and shim them otherwise

include/link/assign.hpp

@@ -9,9 +9,9 @@
 extern uint64_t nbSectionsToAssign;
 
 // Assigns all sections a slice of the address space
-void assign_AssignSections(void);
+void assign_AssignSections();
 
 // `free`s all assignment memory that was allocated
-void assign_Cleanup(void);
+void assign_Cleanup();
 
 #endif // RGBDS_LINK_ASSIGN_H

include/link/object.hpp

@@ -15,12 +15,12 @@ void obj_ReadFile(char const *fileName, unsigned int i);
 /*
  * Perform validation on the object files' contents
  */
-void obj_DoSanityChecks(void);
+void obj_DoSanityChecks();
 
 /*
  * Evaluate all assertions
  */
-void obj_CheckAssertions(void);
+void obj_CheckAssertions();
 
 /*
  * Sets up object file reading
@@ -31,6 +31,6 @@ void obj_Setup(unsigned int nbFiles);
 /*
  * `free`s all object memory that was allocated.
  */
-void obj_Cleanup(void);
+void obj_Cleanup();
 
 #endif // RGBDS_LINK_OBJECT_H

include/link/output.hpp

@@ -24,6 +24,6 @@ Section const *out_OverlappingSection(Section const *section);
 /*
  * Writes all output (bin, sym, map) files.
  */
-void out_WriteFiles(void);
+void out_WriteFiles();
 
 #endif // RGBDS_LINK_OUTPUT_H

include/link/patch.hpp

@@ -28,6 +28,6 @@ void patch_CheckAssertions(std::deque<Assertion> &assertions);
 /*
  * Applies all SECTIONs' patches to them
  */
-void patch_ApplyPatches(void);
+void patch_ApplyPatches();
 
 #endif // RGBDS_LINK_PATCH_H

include/link/section.hpp

@@ -76,6 +76,6 @@ Section *sect_GetSection(std::string const &name);
 /*
  * Checks if all sections meet reasonable criteria, such as max size
  */
-void sect_DoSanityChecks(void);
+void sect_DoSanityChecks();
 
 #endif // RGBDS_LINK_SECTION_H

include/version.hpp

@@ -9,7 +9,7 @@ extern "C" {
 #define PACKAGE_VERSION_MINOR 7
 #define PACKAGE_VERSION_PATCH 0
 
-char const *get_package_version_string(void);
+char const *get_package_version_string();
 
 }