chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0844203
)
[PATCH] trivial clenaup of namedev code
author
kay.sievers@vrfy.org
<kay.sievers@vrfy.org>
Fri, 4 Mar 2005 19:52:19 +0000
(20:52 +0100)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 06:39:48 +0000
(23:39 -0700)
namedev.c
patch
|
blob
|
history
diff --git
a/namedev.c
b/namedev.c
index f0a5c34f79a777659706aa9f1c3e37781b8b1c64..41f0bc0f161743a4ab971be63f99a8c91df66e18 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-168,8
+168,7
@@
static int find_free_number(struct udevice *udev, const char *name)
}
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
}
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
- struct sysfs_class_device *class_dev,
- struct sysfs_device *sysfs_device)
+ struct sysfs_class_device *class_dev, struct sysfs_device *sysfs_device)
{
char temp[NAME_SIZE];
char temp2[NAME_SIZE];
{
char temp[NAME_SIZE];
char temp2[NAME_SIZE];
@@
-203,26
+202,18
@@
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
switch (c) {
case 'p':
switch (c) {
case 'p':
- if (strlen(udev->devpath) == 0)
- break;
strfieldcatmax(string, udev->devpath, maxsize);
dbg("substitute kernel name '%s'", udev->kernel_name);
break;
case 'b':
strfieldcatmax(string, udev->devpath, maxsize);
dbg("substitute kernel name '%s'", udev->kernel_name);
break;
case 'b':
- if (strlen(udev->bus_id) == 0)
- break;
strfieldcatmax(string, udev->bus_id, maxsize);
dbg("substitute bus_id '%s'", udev->bus_id);
break;
case 'k':
strfieldcatmax(string, udev->bus_id, maxsize);
dbg("substitute bus_id '%s'", udev->bus_id);
break;
case 'k':
- if (strlen(udev->kernel_name) == 0)
- break;
strfieldcatmax(string, udev->kernel_name, maxsize);
dbg("substitute kernel name '%s'", udev->kernel_name);
break;
case 'n':
strfieldcatmax(string, udev->kernel_name, maxsize);
dbg("substitute kernel name '%s'", udev->kernel_name);
break;
case 'n':
- if (strlen(udev->kernel_number) == 0)
- break;
strfieldcatmax(string, udev->kernel_number, maxsize);
dbg("substitute kernel number '%s'", udev->kernel_number);
break;
strfieldcatmax(string, udev->kernel_number, maxsize);
dbg("substitute kernel number '%s'", udev->kernel_number);
break;
@@
-235,7
+226,7
@@
static void apply_format(struct udevice *udev, char *string, size_t maxsize,
dbg("substitute major number '%u'", major(udev->devt));
break;
case 'c':
dbg("substitute major number '%u'", major(udev->devt));
break;
case 'c':
- if (
strlen(udev->program_result) == 0
)
+ if (
udev->program_result[0] == '\0'
)
break;
/* get part part of the result string */
i = 0;
break;
/* get part part of the result string */
i = 0;
@@
-730,7
+721,7
@@
int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
return -1;
}
if (dev->ignore_remove) {
return -1;
}
if (dev->ignore_remove) {
- udev->ignore_remove =
dev->ignore_remove
;
+ udev->ignore_remove =
1
;
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 */
@@
-782,16
+773,17
@@
int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_d
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);
-
goto exit
;
+
break
;
}
}
}
}
}
}
- /* no rule matched, so we use the kernel name */
- strfieldcpy(udev->name, udev->kernel_name);
- dbg("no rule found, use kernel name '%s'", udev->name);
+ if (udev->name[0] == '\0') {
+ /* no rule matched, so we use the kernel name */
+ strfieldcpy(udev->name, udev->kernel_name);
+ dbg("no rule found, use kernel name '%s'", udev->name);
+ }
-exit:
if (udev->tmp_node[0] != '\0') {
dbg("removing temporary device node");
unlink_secure(udev->tmp_node);
if (udev->tmp_node[0] != '\0') {
dbg("removing temporary device node");
unlink_secure(udev->tmp_node);