patch-2.1.10 linux/drivers/cdrom/cdrom.c

• Lines: 25
• Date: Wed Nov 13 08:16:13 1996
• Orig file: v2.1.9/linux/drivers/cdrom/cdrom.c
• Orig date: Tue Nov 12 15:56:06 1996

diff -u --recursive --new-file v2.1.9/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
@@ -268,13 +268,11 @@
    meaningful format indicated above.
  */
 
-#undef current                          /* set in sched.h */
-
 static
 void sanitize_format(union cdrom_addr *addr,
-                     u_char * current, u_char requested)
+                     u_char * curr, u_char requested)
 {
-        if (*current == requested)
+        if (*curr == requested)
                 return;                 /* nothing to be done! */
         if (requested == CDROM_LBA) {
                 addr->lba = (int) addr->msf.frame +
@@ -287,7 +285,7 @@
                 addr->msf.second = lba % 60;
                 addr->msf.minute = lba / 60;
         }
-        *current = requested;
+        *curr = requested;
 }
 
 /* All checking and format change makes this code really hard to read!