Add UNUSED macro

Suppresses `unused parameter` warnings with GCC and CLANG
dg0yt · Jan 8, 2016 · 93e1aa7 · 93e1aa7
1 parent 188d1a3
commit 93e1aa7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/tmx_utils.c b/src/tmx_utils.c
@@ -143,11 +143,11 @@ char* b64_decode(const char *source, unsigned int *rlength) { /* NULL terminated
 #ifdef WANT_ZLIB
 #include <zlib.h>
 
-void* z_alloc(void *opaque, unsigned int items, unsigned int size) {
+void* z_alloc(void *opaque UNUSED, unsigned int items, unsigned int size) {
 	return tmx_alloc_func(NULL, items *size);
 }
 
-void z_free(void *opaque, void *address) {
+void z_free(void *opaque UNUSED, void *address) {
 	tmx_free_func(address);
 }
 

diff --git a/src/tmx_utils.h b/src/tmx_utils.h
@@ -5,6 +5,13 @@
 #ifndef TMXUTILS_H
 #define TMXUTILS_H
 
+/* UNUSED macro to suppress `unused parameter` warnings with GCC and CLANG */
+#ifdef __GNUC__
+#define UNUSED __attribute__((__unused__))
+#else
+#define UNUSED
+#endif
+
 /*
 	Parser implementations
 */

diff --git a/src/tmx_xml.c b/src/tmx_xml.c
@@ -27,7 +27,7 @@ static void* tmx_malloc(size_t len) {
 	On failure tmx_errno is set and and an error message is generated.
 */
 
-static void error_handler(void *arg, const char *msg, xmlParserSeverities severity, xmlTextReaderLocatorPtr locator) {
+static void error_handler(void *arg UNUSED, const char *msg, xmlParserSeverities severity, xmlTextReaderLocatorPtr locator) {
 	if (severity == XML_PARSER_SEVERITY_ERROR) {
 		tmx_err(E_XDATA, "xml parser: error at line %d: %s", xmlTextReaderLocatorLineNumber(locator), msg);
 	}