libudev: do not use any udev source file

[elogind.git] / udev / udev_device.c

diff --git a/udev/udev_device.c b/udev/udev_device.c
index 130c714301935b187a6350d32a53e12d1d44693d..751b7cd91fa9a0d6ecfab5a2026ac546349a52ca 100644 (file)
--- a/udev/udev_device.c
+++ b/udev/udev_device.c
@@ -1,22 +1,20 @@
 /*
- * Copyright (C) 2004-2006 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2004-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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
@@ -34,48 +32,50 @@
 #include "udev_rules.h"
 
 
-struct udevice *udev_device_init(void)
+struct udevice *udev_device_init(struct udev *udev)
 {
-       struct udevice *udev;
+       struct udevice *udevice;
 
-       udev = malloc(sizeof(struct udevice));
-       if (udev == NULL)
+       udevice = malloc(sizeof(struct udevice));
+       if (udevice == NULL)
                return NULL;
-       memset(udev, 0x00, sizeof(struct udevice));
+       memset(udevice, 0x00, sizeof(struct udevice));
+
+       udevice->udev = udev;
 
-       INIT_LIST_HEAD(&udev->symlink_list);
-       INIT_LIST_HEAD(&udev->run_list);
-       INIT_LIST_HEAD(&udev->env_list);
+       INIT_LIST_HEAD(&udevice->symlink_list);
+       INIT_LIST_HEAD(&udevice->run_list);
+       INIT_LIST_HEAD(&udevice->env_list);
 
        /* set sysfs device to local storage, can be overridden if needed */
-       udev->dev = &udev->dev_local;
+       udevice->dev = &udevice->dev_local;
 
        /* default node permissions */
-       udev->mode = 0660;
-       strcpy(udev->owner, "root");
-       strcpy(udev->group, "root");
+       udevice->mode = 0660;
+       strcpy(udevice->owner, "root");
+       strcpy(udevice->group, "root");
 
-       udev->event_timeout = -1;
-       return udev;
+       udevice->event_timeout = -1;
+       return udevice;
 }
 
-void udev_device_cleanup(struct udevice *udev)
+void udev_device_cleanup(struct udevice *udevice)
 {
-       if (udev == NULL)
+       if (udevice == NULL)
                return;
-       name_list_cleanup(&udev->symlink_list);
-       name_list_cleanup(&udev->run_list);
-       name_list_cleanup(&udev->env_list);
-       free(udev);
+       name_list_cleanup(udevice->udev, &udevice->symlink_list);
+       name_list_cleanup(udevice->udev, &udevice->run_list);
+       name_list_cleanup(udevice->udev, &udevice->env_list);
+       free(udevice);
 }
 
-dev_t udev_device_get_devt(struct udevice *udev)
+dev_t udev_device_get_devt(struct udevice *udevice)
 {
        const char *attr;
        unsigned int maj, min;
 
        /* read it from sysfs  */
-       attr = sysfs_attr_get_value(udev->dev->devpath, "dev");
+       attr = sysfs_attr_get_value(udevice->udev, udevice->dev->devpath, "dev");
        if (attr != NULL) {
                if (sscanf(attr, "%u:%u", &maj, &min) == 2)
                        return makedev(maj, min);