[PATCH] clean up match_place()

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index 5c328594d4971bb0e545a395bce2856c845b37af..aa45b79b13a917af91af56ae84cecea7a4cdef1f 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -228,12 +228,12 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                        dbg("substitute kernel number '%s'", udev->kernel_number);
                                break;
                case 'm':
                        dbg("substitute kernel number '%s'", udev->kernel_number);
                                break;
                case 'm':

-                       strintcatmax(string, udev->minor, maxsize);
-                       dbg("substitute minor number '%u'", udev->minor);
+                       strintcatmax(string, minor(udev->devt), maxsize);
+                       dbg("substitute minor number '%u'", minor(udev->devt));

                        break;
                case 'M':
                        break;
                case 'M':

-                       strintcatmax(string, udev->major, maxsize);
-                       dbg("substitute major number '%u'", udev->major);
+                       strintcatmax(string, major(udev->devt), maxsize);
+                       dbg("substitute major number '%u'", major(udev->devt));

                        break;
                case 'c':
                        if (strlen(udev->program_result) == 0)
                        break;
                case 'c':
                        if (strlen(udev->program_result) == 0)


@@ -317,8 +317,9 @@ static void apply_format(struct udevice *udev, char *string, size_t maxsize,
                case 'N':
                        if (udev->tmp_node[0] == '\0') {
                                dbg("create temporary device node for callout");
                case 'N':
                        if (udev->tmp_node[0] == '\0') {
                                dbg("create temporary device node for callout");

-                               snprintf(udev->tmp_node, NAME_SIZE-1, "%s/.tmp-%u-%u", udev_root, udev->major, udev->minor);
-                               udev_make_node(udev, udev->tmp_node, udev->major, udev->minor, 0600, 0, 0);
+                               snprintf(udev->tmp_node, NAME_SIZE, "%s/.tmp-%u-%u", udev_root, major(udev->devt), minor(udev->devt));
+                               udev->tmp_node[NAME_SIZE] = '\0';
+                               udev_make_node(udev, udev->tmp_node, udev->devt, 0600, 0, 0);

                        }
                        strfieldcatmax(string, udev->tmp_node, maxsize);
                        dbg("substitute temporary device node name '%s'", udev->tmp_node);
                        }
                        strfieldcatmax(string, udev->tmp_node, maxsize);
                        dbg("substitute temporary device node name '%s'", udev->tmp_node);


@@ -552,32 +553,27 @@ static int match_id(struct config_device *dev, struct sysfs_class_device *class_
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];
 static int match_place(struct config_device *dev, struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
 {
        char path[SYSFS_PATH_MAX];

-       int found;
-       char *temp = NULL;
+       char *temp;

 
        /* we have to have a sysfs device for PLACE to work */
        if (!sysfs_device)
                return -ENODEV;
 
 
        /* we have to have a sysfs device for PLACE to work */
        if (!sysfs_device)
                return -ENODEV;
 

-       found = 0;

        strfieldcpy(path, sysfs_device->path);
        temp = strrchr(path, '/');
        dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
        strfieldcpy(path, sysfs_device->path);
        temp = strrchr(path, '/');
        dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);

-       if (strstr(temp, dev->place) != NULL) {
-               found = 1;
-       } else {
-               *temp = 0x00;
-               temp = strrchr(path, '/');
-               dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
-               if (strstr(temp, dev->place) != NULL)
-                       found = 1;
-       }
-       if (!found) {
-               dbg("place doesn't match");
-               return -ENODEV;
-       }
+       if (strstr(temp, dev->place) != NULL)
+               return 0;

 
 

-       return 0;
+       /* try the parent */
+       temp[0] = '\0';
+       temp = strrchr(path, '/');
+       dbg("search '%s' in '%s', path='%s'", dev->place, temp, path);
+       if (strstr(temp, dev->place) == NULL)
+               return 0;
+
+       dbg("place doesn't match");
+       return -ENODEV;

 }
 
 static int match_rule(struct udevice *udev, struct config_device *dev,
 }
 
 static int match_rule(struct udevice *udev, struct config_device *dev,


@@ -770,7 +766,7 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                dbg_parse("remove event should be ignored");
                        }
                        /* apply all_partitions option only at a main block device */
                                dbg_parse("remove event should be ignored");
                        }
                        /* apply all_partitions option only at a main block device */

-                       if (dev->partitions && udev->type == 'b' && udev->kernel_number[0] == '\0') {
+                       if (dev->partitions && udev->type == BLOCK && udev->kernel_number[0] == '\0') {

                                udev->partitions = dev->partitions;
                                dbg("creation of partition nodes requested");
                        }
                                udev->partitions = dev->partitions;
                                dbg("creation of partition nodes requested");
                        }


@@ -814,7 +810,7 @@ int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
                                strfieldcpy(udev->config_file, dev->config_file);
                                udev->config_line = dev->config_line;
 
                                strfieldcpy(udev->config_file, dev->config_file);
                                udev->config_line = dev->config_line;
 

-                               if (udev->type != 'n')
+                               if (udev->type != NET)

                                        dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
                                            udev->name, udev->owner, udev->group, udev->mode, udev->partitions);
 
                                        dbg("name, '%s' is going to have owner='%s', group='%s', mode=%#o partitions=%i",
                                            udev->name, udev->owner, udev->group, udev->mode, udev->partitions);