diff --git a/lib/_cdio_sunos.c b/lib/_cdio_sunos.c
index 0d8c7ad4..c6f686a0 100644
--- a/lib/_cdio_sunos.c
+++ b/lib/_cdio_sunos.c
@@ -1,8 +1,8 @@
 /*
-    $Id: _cdio_sunos.c,v 1.23 2004/03/06 05:04:41 rocky Exp $
+    $Id: _cdio_sunos.c,v 1.24 2004/03/06 18:22:07 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-    Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
 
 #ifdef HAVE_SOLARIS_CDROM
 
-static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.23 2004/03/06 05:04:41 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.24 2004/03/06 18:22:07 rocky Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -229,7 +229,7 @@ _cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn, 
-			 bool mode1_form2)
+			 bool b_form2)
 {
 
   char buf[M2RAW_SECTOR_SIZE] = { 0, };
@@ -240,7 +240,7 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
     return -1;
   if (0 > cdio_generic_read(env, buf, CDIO_CD_FRAMESIZE))
     return -1;
-  memcpy (data, buf, mode1_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
+  memcpy (data, buf, b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
 #endif
   return 0;
 }
@@ -252,17 +252,17 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn, 
-			  bool mode1_form2, unsigned int nblocks)
+			  bool b_form2, unsigned int nblocks)
 {
   _img_private_t *_obj = env;
   unsigned int i;
   int retval;
-  unsigned int blocksize = mode1_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+  unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
     if ( (retval = _cdio_read_mode1_sector (_obj, 
 					    ((char *)data) + (blocksize * i),
-					    lsn + i, mode1_form2)) )
+					    lsn + i, b_form2)) )
       return retval;
   }
   return 0;
@@ -274,7 +274,7 @@ _cdio_read_mode1_sectors (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn, 
-			 bool mode2_form2)
+			 bool b_form2)
 {
   char buf[M2RAW_SECTOR_SIZE] = { 0, };
   struct cdrom_msf *msf = (struct cdrom_msf *) &buf;
@@ -362,7 +362,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
       }
     }
   
-  if (mode2_form2)
+  if (b_form2)
     memcpy (data, buf, M2RAW_SECTOR_SIZE);
   else
     memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
@@ -377,17 +377,17 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode2_sectors (void *env, void *data, lsn_t lsn, 
-			  bool mode2_form2, unsigned int nblocks)
+			  bool b_form2, unsigned int nblocks)
 {
   _img_private_t *_obj = env;
   unsigned int i;
   int retval;
-  unsigned int blocksize = mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+  unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
     if ( (retval = _cdio_read_mode2_sector (_obj, 
 					    ((char *)data) + (blocksize * i),
-					    lsn + i, mode2_form2)) )
+					    lsn + i, b_form2)) )
       return retval;
   }
   return 0;
diff --git a/lib/image/bincue.c b/lib/image/bincue.c
index 29b4c187..9f66a8e0 100644
--- a/lib/image/bincue.c
+++ b/lib/image/bincue.c
@@ -1,5 +1,5 @@
 /*
-    $Id: bincue.c,v 1.4 2004/03/06 03:21:59 rocky Exp $
+    $Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -24,7 +24,7 @@
    (*.cue).
 */
 
-static const char _rcsid[] = "$Id: bincue.c,v 1.4 2004/03/06 03:21:59 rocky Exp $";
+static const char _rcsid[] = "$Id: bincue.c,v 1.5 2004/03/06 18:22:07 rocky Exp $";
 
 #include "cdio_assert.h"
 #include "cdio_private.h"
@@ -511,7 +511,7 @@ _cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn, 
-			 bool mode1_form2)
+			 bool b_form2)
 {
   _img_private_t *_obj = env;
   int ret;
@@ -533,7 +533,7 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
   if (ret==0) return ret;
 
   memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE, 
-	  mode1_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
+	  b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
 
   return 0;
 }
@@ -545,17 +545,17 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn, 
-			  bool mode1_form2, unsigned int nblocks)
+			  bool b_form2, unsigned int nblocks)
 {
   _img_private_t *_obj = env;
   int i;
   int retval;
-  unsigned int blocksize = mode1_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+  unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
     if ( (retval = _cdio_read_mode1_sector (_obj, 
 					    ((char *)data) + (blocksize * i),
-					    lsn + i, mode1_form2)) )
+					    lsn + i, b_form2)) )
       return retval;
   }
   return 0;
@@ -567,7 +567,7 @@ _cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
  */
 static int
 _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn, 
-			 bool mode2_form2)
+			 bool b_form2)
 {
   _img_private_t *_obj = env;
   int ret;
@@ -596,7 +596,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
 
 
   /* See NOTE above. */
-  if (mode2_form2)
+  if (b_form2)
     memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE, 
 	    M2RAW_SECTOR_SIZE);
   else
@@ -612,17 +612,17 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn, 
-			  bool mode2_form2, unsigned int nblocks)
+			  bool b_form2, unsigned int nblocks)
 {
   _img_private_t *_obj = env;
   int i;
   int retval;
-  unsigned int blocksize = mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+  unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
     if ( (retval = _cdio_read_mode2_sector (_obj, 
 					    ((char *)data) + (blocksize * i),
-					    lsn + i, mode2_form2)) )
+					    lsn + i, b_form2)) )
       return retval;
   }
   return 0;
diff --git a/lib/image/nrg.c b/lib/image/nrg.c
index 9c6aa500..ade69fc6 100644
--- a/lib/image/nrg.c
+++ b/lib/image/nrg.c
@@ -1,7 +1,7 @@
 /*
-    $Id: nrg.c,v 1.2 2004/03/06 03:22:50 rocky Exp $
+    $Id: nrg.c,v 1.3 2004/03/06 18:22:07 rocky Exp $
 
-    Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
+    Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 
     This program is free software; you can redistribute it and/or modify
@@ -48,7 +48,7 @@
 #include "cdio_private.h"
 #include "_cdio_stdio.h"
 
-static const char _rcsid[] = "$Id: nrg.c,v 1.2 2004/03/06 03:22:50 rocky Exp $";
+static const char _rcsid[] = "$Id: nrg.c,v 1.3 2004/03/06 18:22:07 rocky Exp $";
 
 /* structures used */
 
@@ -843,7 +843,7 @@ _cdio_read_audio_sectors (void *env, void *data, lsn_t lsn,
 
 static int
 _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn, 
-			 bool mode1_form2)
+			 bool b_form2)
 {
   _img_private_t *_obj = env;
   char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
@@ -885,7 +885,7 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
     cdio_warn ("reading into pre gap (lsn %lu)", (long unsigned int) lsn);
 
   memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE, 
-	  mode1_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
+	  b_form2 ? M2RAW_SECTOR_SIZE: CDIO_CD_FRAMESIZE);
 
   return 0;
 }
@@ -897,17 +897,17 @@ _cdio_read_mode1_sector (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn, 
-			  bool mode1_form2, unsigned nblocks)
+			  bool b_form2, unsigned nblocks)
 {
   _img_private_t *_obj = env;
   int i;
   int retval;
-  unsigned int blocksize = mode1_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+  unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
     if ( (retval = _cdio_read_mode1_sector (_obj, 
 					    ((char *)data) + (blocksize * i),
-					    lsn + i, mode1_form2)) )
+					    lsn + i, b_form2)) )
       return retval;
   }
   return 0;
@@ -915,7 +915,7 @@ _cdio_read_mode1_sectors (void *env, void *data, uint32_t lsn,
 
 static int
 _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn, 
-			 bool mode2_form2)
+			 bool b_form2)
 {
   _img_private_t *_obj = env;
   char buf[CDIO_CD_FRAMESIZE_RAW] = { 0, };
@@ -954,7 +954,7 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
   if (!node)
     cdio_warn ("reading into pre gap (lsn %lu)", (long unsigned int) lsn);
 
-  if (mode2_form2)
+  if (b_form2)
     memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE, 
 	    M2RAW_SECTOR_SIZE);
   else
@@ -970,17 +970,17 @@ _cdio_read_mode2_sector (void *env, void *data, lsn_t lsn,
  */
 static int
 _cdio_read_mode2_sectors (void *env, void *data, uint32_t lsn, 
-			  bool mode2_form2, unsigned nblocks)
+			  bool b_form2, unsigned nblocks)
 {
   _img_private_t *_obj = env;
   int i;
   int retval;
-  unsigned int blocksize = mode2_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
+  unsigned int blocksize = b_form2 ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE;
 
   for (i = 0; i < nblocks; i++) {
     if ( (retval = _cdio_read_mode2_sector (_obj, 
 					    ((char *)data) + (blocksize * i),
-					    lsn + i, mode2_form2)) )
+					    lsn + i, b_form2)) )
       return retval;
   }
   return 0;