[udev] namedev.c - change order of fields in CALLOUT

[Kay Sievers <kay.sievers@vrfy.org>]

[-- Attachment #1: Type: text/plain, Size: 471 bytes --]

Hi Greg,
I want to bring the CALLOUT field ordering in line with the other
methods, cause the current parsing relies on the ordering it's good
to have it like the others. The BUS= is now the first expected field.

Also made the last two remaining field names to uppercase and the man page
callout example is updated.

thanks,
Kay


10-namedev.c-callout-fields-order.diff
10-udev.8-callout-fields-order.diff
  namedev.c - reorder CALLOUT fields to match the other methods

[-- Attachment #2: 10-namedev.c-callout-fields-order.diff --]
[-- Type: text/plain, Size: 1223 bytes --]

--- ../udev/namedev.c	2003-11-20 22:07:06.000000000 +0100
+++ namedev.c	2003-11-20 22:59:27.000000000 +0100
@@ -286,7 +286,7 @@
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("id", &temp, &temp3);
+			retval = get_value("ID", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.id, temp3);
@@ -314,7 +314,7 @@
 
 			/* PLACE="place" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("place", &temp, &temp3);
+			retval = get_value("PLACE", &temp, &temp3);
 			if (retval)
 				break;
 			strfieldcpy(dev.place, temp3);
@@ -353,18 +353,18 @@
 			/* number type */
 			dev.type = CALLOUT;
 
-			/* PROGRAM="executable" */
-			retval = get_value("PROGRAM", &temp, &temp3);
+			/* BUS="bus" */
+			retval = get_value("BUS", &temp, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.exec_program, temp3);
+			strfieldcpy(dev.bus, temp3);
 
-			/* BUS="bus" */
+			/* PROGRAM="executable" */
 			temp2 = strsep(&temp, ",");
-			retval = get_value("BUS", &temp, &temp3);
+			retval = get_value("PROGRAM", &temp, &temp3);
 			if (retval)
 				break;
-			strfieldcpy(dev.bus, temp3);
+			strfieldcpy(dev.exec_program, temp3);
 
 			/* ID="id" */
 			temp2 = strsep(&temp, ",");

[-- Attachment #3: 10-udev.8-callout-fields-order.diff --]
[-- Type: text/plain, Size: 491 bytes --]

--- ../udev/udev.8	2003-11-20 22:07:06.000000000 +0100
+++ udev.8	2003-11-20 22:23:50.000000000 +0100
@@ -105,7 +105,7 @@
 REPLACE, KERNEL="ttyUSB1", NAME="pda"
 
 # if /sbin/scsi_id returns "OEM 0815" device will be called disk1
-CALLOUT, PROGRAM="/sbin/scsi_id" BUS="scsi", ID="OEM 0815" NAME="disk1"
+CALLOUT, BUS="scsi", PROGRAM="/sbin/scsi_id", ID="OEM 0815", NAME="disk1"
 
 # USB webcams to be called webcam0, webcam1, ...
 LABEL, BUS="usb", model="WebCam Version 3", NAME="webcam%n"