chiark / gitweb /
[PATCH] fix up printf-like functionality due to previous changes.
authorgreg@kroah.com <greg@kroah.com>
Tue, 18 Nov 2003 09:07:21 +0000 (01:07 -0800)
committerGreg KH <gregkh@suse.de>
Wed, 27 Apr 2005 04:06:24 +0000 (21:06 -0700)
namedev.c

index f6be43e..6444dd0 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -601,10 +601,6 @@ label_found:
                        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);
@@ -819,7 +815,9 @@ static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
 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;