shithub: rgbds

Info  •  Files  •  Log  •  Branches

Ignore unused arguments in a more standard way

--- a/include/helpers.h

+++ b/include/helpers.h

@@ -14,7 +14,6 @@

 	#define format_(archetype, str_index, first_arg) \

 		__attribute__ ((format (archetype, str_index, first_arg)))

 	#define noreturn_	__attribute__ ((noreturn))

-	#define unused_		__attribute__ ((unused))

 	#define trap_		__builtin_trap()

 #else

 	/* Unsupported, but no need to throw a fit */

--- a/src/asm/globlex.c

+++ b/src/asm/globlex.c

@@ -318,8 +318,9 @@

 	return 0;

 }

-uint32_t PutUniqueArg(unused_ char *src, uint32_t size)

+uint32_t PutUniqueArg(char *src, uint32_t size)

 {

+	(void)src;

 	char *s;

 	yyskipbytes(size);

--- a/src/asm/symbol.c

+++ b/src/asm/symbol.c

@@ -49,8 +49,9 @@

 static char SavedSECOND[3];

 static bool exportall;

-static int32_t Callback_NARG(unused_ struct sSymbol const *sym)

+static int32_t Callback_NARG(struct sSymbol const *self)

 {

+	(void)self;

 	uint32_t i = 0;

 	while (currentmacroargs[i] && i < MAXMACROARGS)

@@ -59,8 +60,9 @@

 	return i;

 }

-static int32_t Callback__LINE__(unused_ struct sSymbol const *sym)

+static int32_t Callback__LINE__(struct sSymbol const *self)

 {

+	(void)self;

 	return nLineNo;

 }