diff --git a/example/mmc3.c b/example/mmc3.c
index e436c47e..3c05928a 100644
--- a/example/mmc3.c
+++ b/example/mmc3.c
@@ -61,7 +61,7 @@ main(int argc, const char *argv[])
   }
   
   ret = mmc_get_tray_status(p_cdio);
-  switch(ret) {
+  switch((int) ret) {
   case 0:
     printf("CD-ROM drive %s is closed.\n", psz_drive);
     do_eject = true;
@@ -77,7 +77,7 @@ main(int argc, const char *argv[])
   }
   
   ret = mmc_get_media_changed(p_cdio);
-  switch(ret) {
+  switch((int) ret) {
   case 0:
     printf("CD-ROM drive %s media not changed since last test.\n", psz_drive);
     break;
@@ -96,7 +96,7 @@ main(int argc, const char *argv[])
     ret = cdio_close_tray(psz_drive, &driver_id);
 
   ret = mmc_get_tray_status(p_cdio);
-  switch(ret) {
+  switch((int) ret) {
   case 0:
     printf("CD-ROM drive %s is closed.\n", psz_drive);
     break;
@@ -110,7 +110,7 @@ main(int argc, const char *argv[])
   }
   
   ret = mmc_get_media_changed(p_cdio);
-  switch(ret) {
+  switch((int) ret) {
   case 0:
     printf("CD-ROM drive %s media not changed since last test.\n", psz_drive);
     break;
diff --git a/example/sample3.c b/example/sample3.c
index 84d3e8fd..a4b85835 100644
--- a/example/sample3.c
+++ b/example/sample3.c
@@ -29,8 +29,7 @@
 
 static void
 print_analysis(cdio_iso_analysis_t cdio_iso_analysis, 
-	       cdio_fs_anal_t fs, int first_data, unsigned int num_audio, 
-	       track_t num_tracks, track_t first_track_num, CdIo_t *p_cdio)
+	       cdio_fs_anal_t fs, int first_data, unsigned int num_audio)
 {
   switch(CDIO_FSTYPE(fs)) {
   case CDIO_FS_AUDIO:
@@ -182,8 +181,7 @@ main(int argc, const char *argv[])
       
       fs = cdio_guess_cd_type(p_cdio, start_track, i, &cdio_iso_analysis);
       
-      print_analysis(cdio_iso_analysis, fs, first_data, num_audio,
-		     num_tracks, first_track_num, p_cdio);
+      print_analysis(cdio_iso_analysis, fs, first_data, num_audio);
       
       if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 ||
 	     CDIO_FSTYPE(fs) == CDIO_FS_ISO_HFS  ||
diff --git a/example/sample4.c b/example/sample4.c
index c51e16ec..224e4695 100644
--- a/example/sample4.c
+++ b/example/sample4.c
@@ -40,8 +40,7 @@ log_handler (cdio_log_level_t level, const char message[])
 
 static void
 print_analysis(cdio_iso_analysis_t cdio_iso_analysis, 
-	       cdio_fs_anal_t fs, int first_data, unsigned int num_audio, 
-	       track_t num_tracks, track_t first_track_num, CdIo_t *p_cdio)
+	       cdio_fs_anal_t fs, int first_data, unsigned int num_audio)
 {
   switch(CDIO_FSTYPE(fs)) {
   case CDIO_FS_AUDIO:
@@ -201,8 +200,7 @@ main(int argc, const char *argv[])
       
       fs = cdio_guess_cd_type(p_cdio, start_track, i, &cdio_iso_analysis);
       
-      print_analysis(cdio_iso_analysis, fs, first_data, num_audio,
-		     num_tracks, first_track_num, p_cdio);
+      print_analysis(cdio_iso_analysis, fs, first_data, num_audio);
       
       if ( !(CDIO_FSTYPE(fs) == CDIO_FS_ISO_9660 ||
 	     CDIO_FSTYPE(fs) == CDIO_FS_ISO_HFS  ||