Changes to the way get_* routines print out datasysfsutils-1_0_0

4 files changed, 22 insertions, 16 deletions

diff --git a/test/get_bus_devices_list.c b/test/get_bus_devices_list.c
index c471f8d..2548470 100644
--- a/test/get_bus_devices_list.c
+++ b/test/get_bus_devices_list.c
@@ -41,12 +41,12 @@ int main(int argc, char *argv[])
 	}
 	name = sysfs_open_bus_devices_list(argv[1]);
 	if (name != NULL) {
-		fprintf(stdout, "Devices on bus %s:\n", argv[1]);
+		fprintf(stdout, "Devices on bus \"%s\":\n", argv[1]);
 		dlist_for_each_data(name, cur, char) {
 			fprintf(stdout, "\t%s\n", cur);
 		}
 	} else
-		fprintf(stdout, "Bus %s not found\n", argv[1]);
+		fprintf(stdout, "Bus \"%s\" not found\n", argv[1]);
 	sysfs_close_list(name);
 
 	return 0;
diff --git a/test/get_class_dev.c b/test/get_class_dev.c
index d52a2bc..0cb9437 100644
--- a/test/get_class_dev.c
+++ b/test/get_class_dev.c
@@ -45,25 +45,26 @@ int main(int argc, char *argv[])
 
 	cdev = sysfs_open_class_device(argv[1], argv[2]);
 	if (cdev == NULL) {
-		fprintf(stdout, "Device %s not found\n", argv[2]);
+		fprintf(stdout, "Device \"%s\" not found\n", argv[2]);
 		return 1;
 	}
 	
-	fprintf(stdout, "Class device %s\n", cdev->name);
+	fprintf(stdout, "Class device \"%s\"\n", cdev->name);
 	
 	attrlist = sysfs_get_classdev_attributes(cdev);
 	if (attrlist != NULL) {
 		dlist_for_each_data(attrlist, attr, struct sysfs_attribute) 
-			fprintf(stdout, "\t%s : %s", attr->name, attr->value);
+			fprintf(stdout, "\t%-20s : %s", 
+					attr->name, attr->value);
 	}
 	fprintf(stdout, "\n");
 		
 	device = sysfs_get_classdev_device(cdev);
 	if (device)
-		fprintf(stdout, "\tDevice : %s\n", cdev->sysdevice->bus_id);
+		fprintf(stdout, "\tDevice : \"%s\"\n", cdev->sysdevice->bus_id);
 	driver = sysfs_get_classdev_driver(cdev);
 	if (driver)
-		fprintf(stdout, "\tDriver : %s\n", cdev->driver->name);
+		fprintf(stdout, "\tDriver : \"%s\"\n", cdev->driver->name);
 
 	sysfs_close_class_device(cdev);
 	return 0;
diff --git a/test/get_classdev_parent.c b/test/get_classdev_parent.c
index b5d3949..56be44d 100644
--- a/test/get_classdev_parent.c
+++ b/test/get_classdev_parent.c
@@ -40,29 +40,33 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 	
-	fprintf(stdout, "Class device %s\n", cdev->name);
+	fprintf(stdout, "Class device \"%s\"\n", cdev->name);
 	
 	attrlist = sysfs_get_classdev_attributes(cdev);
 	if (attrlist != NULL) {
 		dlist_for_each_data(attrlist, attr, struct sysfs_attribute) 
-			fprintf(stdout, "\t%s : %s", attr->name, attr->value);
+			fprintf(stdout, "\t%-20s : %s", 
+					attr->name, attr->value);
 	}
 	fprintf(stdout, "\n");
 		
 	device = sysfs_get_classdev_device(cdev);
 	if (device)
-		fprintf(stdout, "\tDevice : %s\n", cdev->sysdevice->bus_id);
+		fprintf(stdout, "\tDevice : \"%s\"\n", cdev->sysdevice->bus_id);
 	driver = sysfs_get_classdev_driver(cdev);
 	if (driver)
-		fprintf(stdout, "\tDriver : %s\n", cdev->driver->name);
+		fprintf(stdout, "\tDriver : \"%s\"\n", cdev->driver->name);
 
 	parent = sysfs_get_classdev_parent(cdev);
 	if (parent != NULL) {
-		fprintf(stdout, "parent is %s\n", parent->name);
+		fprintf(stdout, "Device \"%s\"'s parent is \"%s\"\n", 
+				cdev->name, parent->name);
 		attrlist = sysfs_get_classdev_attributes(parent);
 		if (attrlist != NULL) {
-			dlist_for_each_data(attrlist, attr, struct sysfs_attribute) 
-				fprintf(stdout, "\t%s : %s", attr->name, attr->value);
+			dlist_for_each_data(attrlist, attr, 
+					struct sysfs_attribute) 
+				fprintf(stdout, "\t%-20s : %s", 
+						attr->name, attr->value);
 		}
 		fprintf(stdout, "\n");
 	} else
diff --git a/test/get_device.c b/test/get_device.c
index 5498f87..a2e72ca 100644
--- a/test/get_device.c
+++ b/test/get_device.c
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
 
 	device = sysfs_open_device(argv[1], argv[2]);
 	if (device == NULL) {
-		fprintf(stdout, "Device %s not found on bus %s\n", 
+		fprintf(stdout, "Device \"%s\" not found on bus \"%s\"\n", 
 					argv[2], argv[1]);
 		return 1;
 	}
@@ -52,7 +52,8 @@ int main(int argc, char *argv[])
 	if (attrlist != NULL) {
 		dlist_for_each_data(attrlist, attr, 
 					struct sysfs_attribute) 
-			fprintf(stdout, "\t%s : %s", attr->name, attr->value);
+			fprintf(stdout, "\t%-20s : %s", 
+					attr->name, attr->value);
 	}
 	fprintf(stdout, "\n");