lib: cleanup

contrib/ccan/compiler/compiler.h

@@ -228,16 +228,4 @@
 #define WARN_UNUSED_RESULT
 #endif
 #endif
-
-#ifndef NON_NULL
-#if HAVE_ATTRIBUTE_NONNULL
-/**
- * NON_NULL - nonnull attribute specifies that some function parameters should be non-null pointers.
- */
-#define NON_NULL(...) __attribute__((nonnull(__VA_ARGS__)))
-#else
-#define NON_NULL(...)
-#endif
-#endif
-
 #endif /* CCAN_COMPILER_H */

modules/cachectl/cachectl.c

@@ -28,7 +28,6 @@
 #include <time.h>
 #include <libknot/descriptor.h>
 #include <ccan/json/json.h>
-#include <ccan/compiler/compiler.h>
 
 #include "daemon/engine.h"
 #include "lib/module.h"
@@ -44,7 +43,7 @@
 typedef int (*cache_cb_t)(struct kr_cache_txn *txn, namedb_iter_t *it, namedb_val_t *key, void *baton);
 
 /** @internal Prefix walk. */
-NON_NULL(1,2) static int cache_prefixed(struct engine *engine, const char *args, unsigned txn_flags, cache_cb_t cb, void *baton)
+static int cache_prefixed(struct engine *engine, const char *args, unsigned txn_flags, cache_cb_t cb, void *baton)
 {
 	/* Decode parameters */
 	uint8_t namespace = 'R';