X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fudev%2Fudev-builtin-input_id.c;h=445b602f9ca1f7201c90a72762a36fcce65777b7;hp=a062ef7c7a75890eae66fdcc58fd5c382cd57638;hb=3fa5dd6de798e17d93531bc900b8e2dc587c38f3;hpb=6df831f25ebc9f55cd939f04392dad9237706e45

diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
index a062ef7c7..445b602f9 100644
--- 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) 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
@@ -38,6 +38,8 @@
 #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
@@ -49,14 +51,13 @@ static void get_cap_mask(struct udev_device *dev,
                          unsigned long *bitmask, size_t bitmask_size,
                          bool test)
 {
-        struct udev *udev = udev_device_get_udev(dev);
         char text[4096];
         unsigned i;
         char* word;
         unsigned long val;
 
         snprintf(text, sizeof(text), "%s", udev_device_get_sysattr_value(pdev, attr));
-        info(udev, "%s raw kernel attribute: %s\n", attr, text);
+        log_debug("%s raw kernel attribute: %s\n", attr, text);
 
         memset (bitmask, 0, bitmask_size);
         i = 0;
@@ -65,7 +66,7 @@ static void get_cap_mask(struct udev_device *dev,
                 if (i < bitmask_size/sizeof(unsigned long))
                         bitmask[i] = val;
                 else
-                        info(udev, "ignoring %s block %lX which is larger than maximum size\n", attr, val);
+                        log_debug("ignoring %s block %lX which is larger than maximum size\n", attr, val);
                 *word = '\0';
                 ++i;
         }
@@ -73,20 +74,21 @@ static void get_cap_mask(struct udev_device *dev,
         if (i < bitmask_size / sizeof(unsigned long))
                 bitmask[i] = val;
         else
-                info(udev, "ignoring %s block %lX which is larger than maximum size\n", attr, val);
+                log_debug("ignoring %s block %lX which is larger than maximum size\n", attr, val);
 
         if (test) {
                 /* printf pattern with the right unsigned long number of hex chars */
                 snprintf(text, sizeof(text), "  bit %%4u: %%0%zilX\n", 2 * sizeof(unsigned long));
-                info(udev, "%s decoded bit map:\n", attr);
+                log_debug("%s decoded bit map:\n", attr);
                 val = bitmask_size / sizeof (unsigned long);
                 /* skip over leading zeros */
                 while (bitmask[val-1] == 0 && val > 0)
                         --val;
                 for (i = 0; i < val; ++i)
-                        info(udev, 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,
@@ -143,14 +145,13 @@ static void test_key (struct udev_device *dev,
                       const unsigned long* bitmask_key,
                       bool test)
 {
-        struct udev *udev = udev_device_get_udev(dev);
         unsigned i;
         unsigned long found;
         unsigned long mask;
 
         /* do we have any KEY_* capability? */
         if (!test_bit (EV_KEY, bitmask_ev)) {
-                info(udev, "test_key: no EV_KEY capability\n");
+                log_debug("test_key: no EV_KEY capability\n");
                 return;
         }
 
@@ -158,13 +159,13 @@ static void test_key (struct udev_device *dev,
         found = 0;
         for (i = 0; i < BTN_MISC/BITS_PER_LONG; ++i) {
                 found |= bitmask_key[i];
-                info(udev, "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) {
                 for (i = KEY_OK; i < BTN_TRIGGER_HAPPY; ++i) {
                         if (test_bit (i, bitmask_key)) {
-                                info(udev, "test_key: Found key %x in high block\n", i);
+                                log_debug("test_key: Found key %x in high block\n", i);
                                 found = 1;
                                 break;
                         }