chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keymap: Add DIXONSP
[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 ee8294b700f0979773c9e4f66c7d3a3f437d437c..445b602f9ca1f7201c90a72762a36fcce65777b7 100644
(file)
--- a/
src/udev/udev-builtin-input_id.c
+++ b/
src/udev/udev-builtin-input_id.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 2009 Martin Pitt <martin.pitt@ubuntu.com>
* Portions Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
*
* Copyright (C) 2009 Martin Pitt <martin.pitt@ubuntu.com>
* Portions Copyright (C) 2004 David Zeuthen, <david@fubar.dk>
- * Copyright (C) 2011 Kay Sievers <kay
.sievers
@vrfy.org>
+ * Copyright (C) 2011 Kay Sievers <kay@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-38,6
+38,8
@@
#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
@@
-49,7
+51,6
@@
static void get_cap_mask(struct udev_device *dev,
unsigned long *bitmask, size_t bitmask_size,
bool test)
{
unsigned long *bitmask, size_t bitmask_size,
bool test)
{
- struct udev *udev = udev_device_get_udev(dev);
char text[4096];
unsigned i;
char* word;
char text[4096];
unsigned i;
char* word;
@@
-87,6
+88,7
@@
static void get_cap_mask(struct udev_device *dev,
log_debug(text, i * BITS_PER_LONG, bitmask[i]);
}
}
log_debug(text, i * BITS_PER_LONG, bitmask[i]);
}
}
+#pragma GCC diagnostic pop
/* pointer devices */
static void test_pointers (struct udev_device *dev,
/* pointer devices */
static void test_pointers (struct udev_device *dev,
@@
-143,7
+145,6
@@
static void test_key (struct udev_device *dev,
const unsigned long* bitmask_key,
bool test)
{
const unsigned long* bitmask_key,
bool test)
{
- struct udev *udev = udev_device_get_udev(dev);
unsigned i;
unsigned long found;
unsigned long mask;
unsigned i;
unsigned long found;
unsigned long mask;
@@
-158,7
+159,7
@@
static void test_key (struct udev_device *dev,
found = 0;
for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i) {
found |= bitmask_key[i];
found = 0;
for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i) {
found |= bitmask_key[i];
- log_debug("test_key: checking bit block %lu for any keys; found=%i\n", i*BITS_PER_LONG, found > 0);
+ log_debug("test_key: checking bit block %lu for any keys; found=%i\n",
(unsigned long)
i*BITS_PER_LONG, found > 0);
}
/* If there are no keys in the lower block, check the higher block */
if (!found) {
}
/* If there are no keys in the lower block, check the higher block */
if (!found) {