chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-dhcp: message_init - only set secs in the client
[elogind.git]
/
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 9b99d1ff9fd5311df4cb80532c8b6cbb34008baa..828b349d9c50610ffd2fc523368d33863f086a20 100644
(file)
--- 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)
#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
/*
* 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;
/* 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]);
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,
/* pointer devices */
static void test_pointers (struct udev_device *dev,