udev: hwdb - search parents for 'modalias' and data

[elogind.git] / src / udev / accelerometer / accelerometer.c

diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
index bc9715b26401fbb926a8a92fc34223750ecc9879..67fed27c5ec456a3e6bd48d5827ab79e03c0f5a9 100644 (file)
--- a/src/udev/accelerometer/accelerometer.c
+++ b/src/udev/accelerometer/accelerometer.c
@@ -205,8 +205,10 @@ static void test_orientation(struct udev *udev,
 
                 r = read(fd, ev, sizeof(struct input_event) * 64);
 
-                if (r < (int) sizeof(struct input_event))
+                if (r < (int) sizeof(struct input_event)) {
+                        close(fd);
                         return;
+                }
 
                 for (i = 0; i < r / (int) sizeof(struct input_event); i++) {
                         if (got_syn == 1) {
@@ -263,7 +265,7 @@ int main (int argc, char** argv)
         if (udev == NULL)
                 return 1;
 
-        udev_log_init("input_id");
+        log_open();
         udev_set_log_fn(udev, log_fn);
 
         /* CLI argument parsing */
@@ -277,8 +279,8 @@ int main (int argc, char** argv)
                 switch (option) {
                 case 'd':
                         debug = 1;
-                        if (udev_get_log_priority(udev) < LOG_INFO)
-                                udev_set_log_priority(udev, LOG_INFO);
+                        log_set_max_level(LOG_DEBUG);
+                        udev_set_log_priority(udev, LOG_DEBUG);
                         break;
                 case 'h':
                         help();
@@ -294,7 +296,7 @@ int main (int argc, char** argv)
         }
 
         /* get the device */
-        snprintf(devpath, sizeof(devpath), "%s/%s", udev_get_sys_path(udev), argv[optind]);
+        snprintf(devpath, sizeof(devpath), "/sys/%s", argv[optind]);
         dev = udev_device_new_from_syspath(udev, devpath);
         if (dev == NULL) {
                 fprintf(stderr, "unable to access '%s'\n", devpath);
@@ -307,9 +309,8 @@ int main (int argc, char** argv)
                 return 0;
         }
 
-        /* Get the children devices and find the devnode
-         * FIXME: use udev_enumerate_add_match_children() instead
-         * when it's available */
+        /* Get the children devices and find the devnode */
+        /* FIXME: use udev_enumerate_add_match_parent() instead */
         devnode = NULL;
         enumerate = udev_enumerate_new(udev);
         udev_enumerate_add_match_property(enumerate, "ID_PATH", id_path);
@@ -349,9 +350,9 @@ int main (int argc, char** argv)
                 return 0;
         }
 
-        info(udev, "Opening accelerometer device %s\n", devnode);
+        log_debug("opening accelerometer device %s\n", devnode);
         test_orientation(udev, dev, devnode);
         free(devnode);
-
+        log_close();
         return 0;
 }