libudev: handle "device" link as parent, handle "class" "block" as "subsystem"

[elogind.git] / udev / udevadm-control.c

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 3dc7a1b52ce196ed780287cd797ceb75a76e1073..e3a91fc9a40f6688ff0c7dfa1973dafff90394f3 100644 (file)
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -1,19 +1,15 @@
 /*
- * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2008 Kay Sievers <kay.sievers@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 the
- *     Free Software Foundation version 2 of the License.
- * 
- *     This program is distributed in the hope that it will be useful, but
- *     WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *     General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License along
- *     with this program; if not, write to the Free Software Foundation, Inc.,
- *     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * 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
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "config.h"
@@ -95,12 +91,12 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                switch (option) {
                case 'l':
                case 'l' + 256:
-                       i = log_priority(optarg);
+                       i = util_log_priority(optarg);
                        if (i < 0) {
                                fprintf(stderr, "invalid number '%s'\n", optarg);
                                goto exit;
                        }
-                       udev_ctrl_send_set_log_level(uctrl, log_priority(optarg));
+                       udev_ctrl_send_set_log_level(uctrl, util_log_priority(optarg));
                        rc = 0;
                        break;
                case 's':
@@ -155,7 +151,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                    "this will stop working in a future release\n");
 
                if (!strncmp(arg, "log_priority=", strlen("log_priority="))) {
-                       udev_ctrl_send_set_log_level(uctrl, log_priority(&arg[strlen("log_priority=")]));
+                       udev_ctrl_send_set_log_level(uctrl, util_log_priority(&arg[strlen("log_priority=")]));
                        rc = 0;
                        goto exit;
                } else if (!strcmp(arg, "stop_exec_queue")) {