chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] cleanup man & remove symlink comment
[elogind.git]
/
namedev.c
diff --git
a/namedev.c
b/namedev.c
index ea75bc5d8f661f9ab6bd5f4e25ed5033e67e6178..fbdb125e4c39ec28a941b46bbd9fa57f9ee47061 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-121,6
+121,7
@@
int add_config_dev(struct config_device *new_dev)
copy_string(dev, new_dev, place);
copy_string(dev, new_dev, kernel_name);
copy_string(dev, new_dev, exec_program);
copy_string(dev, new_dev, place);
copy_string(dev, new_dev, kernel_name);
copy_string(dev, new_dev, exec_program);
+ copy_string(dev, new_dev, symlink);
return 0;
}
return 0;
}
@@
-366,6
+367,7
@@
static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
if (strcmp_pattern(dev->id, udev->callout_value) != 0)
continue;
strfieldcpy(udev->name, dev->name);
if (strcmp_pattern(dev->id, udev->callout_value) != 0)
continue;
strfieldcpy(udev->name, dev->name);
+ strfieldcpy(udev->symlink, dev->symlink);
dbg("callout returned matching value '%s', '%s' becomes '%s'",
dev->id, class_dev->name, udev->name);
return 0;
dbg("callout returned matching value '%s', '%s' becomes '%s'",
dev->id, class_dev->name, udev->name);
return 0;
@@
-412,10
+414,11
@@
label_found:
*c = 0x00;
dbg("compare attribute '%s' value '%s' with '%s'",
dev->sysfs_file, tmpattr->value, dev->sysfs_value);
*c = 0x00;
dbg("compare attribute '%s' value '%s' with '%s'",
dev->sysfs_file, tmpattr->value, dev->sysfs_value);
- if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
+ if (strcmp
_pattern
(dev->sysfs_value, tmpattr->value) != 0)
continue;
strfieldcpy(udev->name, dev->name);
continue;
strfieldcpy(udev->name, dev->name);
+ strfieldcpy(udev->symlink, dev->symlink);
dbg("found matching attribute '%s', '%s' becomes '%s' ",
dev->sysfs_file, class_dev->name, udev->name);
dbg("found matching attribute '%s', '%s' becomes '%s' ",
dev->sysfs_file, class_dev->name, udev->name);
@@
-461,6
+464,7
@@
static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
if (!found)
continue;
strfieldcpy(udev->name, dev->name);
if (!found)
continue;
strfieldcpy(udev->name, dev->name);
+ strfieldcpy(udev->symlink, dev->symlink);
dbg("found matching id '%s', '%s' becomes '%s'",
dev->id, class_dev->name, udev->name);
return 0;
dbg("found matching id '%s', '%s' becomes '%s'",
dev->id, class_dev->name, udev->name);
return 0;
@@
-506,6
+510,7
@@
static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
continue;
strfieldcpy(udev->name, dev->name);
continue;
strfieldcpy(udev->name, dev->name);
+ strfieldcpy(udev->symlink, dev->symlink);
dbg("found matching place '%s', '%s' becomes '%s'",
dev->place, class_dev->name, udev->name);
return 0;
dbg("found matching place '%s', '%s' becomes '%s'",
dev->place, class_dev->name, udev->name);
return 0;
@@
-528,6
+533,7
@@
static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev
continue;
strfieldcpy(udev->name, dev->name);
continue;
strfieldcpy(udev->name, dev->name);
+ strfieldcpy(udev->symlink, dev->symlink);
dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
return 0;
dbg("found name, '%s' becomes '%s'", dev->kernel_name, udev->name);
return 0;
@@
-618,8
+624,9
@@
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
goto done;
found:
goto done;
found:
- /* substitute placeholder
in NAME
*/
+ /* substitute placeholder */
apply_format(udev, udev->name);
apply_format(udev, udev->name);
+ apply_format(udev, udev->symlink);
done:
perm = find_perm(udev->name);
done:
perm = find_perm(udev->name);