fix attributes with parameters to be less messy due to vardiac arguments

This commit is contained in:
2025-08-23 23:01:01 +02:00
parent 8452f7d21e
commit 4fa0a84c94
2 changed files with 5 additions and 5 deletions

View File

@@ -46,14 +46,14 @@
#endif
#if __has_attribute(__format__)
#define FORMAT(...) __attribute__((format(__VA_ARGS__)))
#define FORMAT(args) __attribute__((format args))
#else
#define FORMAT(...)
#define FORMAT(args)
#endif
#if __has_attribute(__nonnull__)
#define NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
#define NONNULL(args) __attribute__((__nonnull__ args))
#else
#define NONNULL(...)
#define NONNULL(args)
#endif
#endif

View File

@@ -127,7 +127,7 @@ int conf_procval(struct conf_entry const *opt, const char *restrict val) {
}
/* utility function for conf_getpat to concatenate 3 strings, where we already know the size */
NONNULL(1, 3)
NONNULL((1, 3))
static char *conf_getpat_concat(const char *restrict s1, const char *restrict s2, const char *restrict s3, size_t s1len, size_t s2len, size_t s3len) {
assert(s2 || (!s2 && !s2len)); // ensuring the programmer passes both s2 and s2len as 0, if they intend to
char *buf, *ptr;