mirror of
https://github.com/thepigeongenerator/mcaselector-lite.git
synced 2025-12-17 09:05:45 +01:00
fix attributes with parameters to be less messy due to vardiac arguments
This commit is contained in:
@@ -46,14 +46,14 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if __has_attribute(__format__)
|
#if __has_attribute(__format__)
|
||||||
#define FORMAT(...) __attribute__((format(__VA_ARGS__)))
|
#define FORMAT(args) __attribute__((format args))
|
||||||
#else
|
#else
|
||||||
#define FORMAT(...)
|
#define FORMAT(args)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if __has_attribute(__nonnull__)
|
#if __has_attribute(__nonnull__)
|
||||||
#define NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
|
#define NONNULL(args) __attribute__((__nonnull__ args))
|
||||||
#else
|
#else
|
||||||
#define NONNULL(...)
|
#define NONNULL(args)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -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 */
|
/* 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) {
|
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
|
assert(s2 || (!s2 && !s2len)); // ensuring the programmer passes both s2 and s2len as 0, if they intend to
|
||||||
char *buf, *ptr;
|
char *buf, *ptr;
|
||||||
|
|||||||
Reference in New Issue
Block a user