release 172

[elogind.git] / extras / edd_id / edd_id.c

diff --git a/extras/edd_id/edd_id.c b/extras/edd_id/edd_id.c
index 90656b44119226d165c1696c4ce9ac6dae55cd79..ac4da07611dfc83331d5fffbdeff6f1502002979 100644 (file)
--- a/extras/edd_id/edd_id.c
+++ b/extras/edd_id/edd_id.c
@@ -4,9 +4,18 @@
  * Copyright (C) 2005 John Hull <John_Hull@Dell.com>
  * Copyright (C) 2005 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 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
@@ -23,7 +32,8 @@
 #include <dirent.h>
 #include <stdint.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static void log_fn(struct udev *udev, int priority,
                   const char *file, int line, const char *fn,
@@ -52,7 +62,7 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                goto exit;
 
-       logging_init("edd_id");
+       udev_log_init("edd_id");
        udev_set_log_fn(udev, log_fn);
 
        for (i = 1 ; i < argc; i++) {
@@ -181,6 +191,6 @@ closedir:
        closedir(dir);
 exit:
        udev_unref(udev);
-       logging_close();
+       udev_log_close();
        return rc;
 }