From bcfce235a3d757f0ec3b0c01e8583382db1adfe2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 20 Feb 2014 18:18:32 +0100 Subject: macro: introduce a nice macro for disabling -Wformat-nonliteral temporarily --- src/udev/udev-builtin-input_id.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/udev/udev-builtin-input_id.c') diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c index 9b99d1ff9..828b349d9 100644 --- a/src/udev/udev-builtin-input_id.c +++ b/src/udev/udev-builtin-input_id.c @@ -38,8 +38,6 @@ #define LONG(x) ((x)/BITS_PER_LONG) #define test_bit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" /* * Read a capability attribute and return bitmask. * @param dev udev_device @@ -84,11 +82,13 @@ static void get_cap_mask(struct udev_device *dev, /* skip over leading zeros */ while (bitmask[val-1] == 0 && val > 0) --val; - for (i = 0; i < val; ++i) + for (i = 0; i < val; ++i) { + DISABLE_WARNING_FORMAT_NONLITERAL; log_debug(text, i * BITS_PER_LONG, bitmask[i]); + REENABLE_WARNING; + } } } -#pragma GCC diagnostic pop /* pointer devices */ static void test_pointers (struct udev_device *dev, -- cgit v1.2.3