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:
98b88db
)
[PATCH] fix up printf-like functionality due to previous changes.
author
greg@kroah.com
<greg@kroah.com>
Tue, 18 Nov 2003 09:07:21 +0000
(
01:07
-0800)
committer
Greg KH
<gregkh@suse.de>
Wed, 27 Apr 2005 04:06:24 +0000
(21:06 -0700)
namedev.c
patch
|
blob
|
history
diff --git
a/namedev.c
b/namedev.c
index f6be43ef51bb841220e273798442e93c97868df5..6444dd0feb957377cf3bd762a09a46c637da5a59 100644
(file)
--- a/
namedev.c
+++ b/
namedev.c
@@
-601,10
+601,6
@@
label_found:
continue;
strcpy(udev->name, dev->name);
continue;
strcpy(udev->name, dev->name);
- if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
- temp = &class_dev->path[strlen(class_dev->path)-1];
- strcat(udev->name, temp);
- }
if (dev->mode != 0) {
udev->mode = dev->mode;
strcpy(udev->owner, dev->owner);
if (dev->mode != 0) {
udev->mode = dev->mode;
strcpy(udev->owner, dev->owner);
@@
-819,7
+815,9
@@
static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
done:
/* substitute placeholder in NAME */
while (1) {
done:
/* substitute placeholder in NAME */
while (1) {
- pos = strchr(udev->name, '%');
+ char *pos = strchr(udev->name, '%');
+ char *dig;
+ char name[NAME_SIZE];
if (pos) {
strcpy(name, pos+2);
*pos = 0x00;
if (pos) {
strcpy(name, pos+2);
*pos = 0x00;