From 7408a7fbb5885033d266b4b31c3abeb695820da3 Mon Sep 17 00:00:00 2001 From: "greg@kroah.com" Date: Tue, 18 Nov 2003 01:07:21 -0800 Subject: [PATCH] fix up printf-like functionality due to previous changes. --- namedev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/namedev.c b/namedev.c index f6be43ef51..6444dd0feb 100644 --- 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; -- cgit v1.2.3-54-g00ecf