[brasero] Removed some unused functions (and file in one case) from the build



commit c2338bfbc682650be2585cf0f55301291db9b0a8
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon Oct 19 21:54:56 2009 +0200

    Removed some unused functions (and file in one case) from the build
    Fixed the warnings about missing prototypes

 libbrasero-media/Makefile.am                       |    1 -
 libbrasero-media/scsi-eject.c                      |  109 --------------------
 libbrasero-media/scsi-get-configuration.c          |    2 +
 libbrasero-media/scsi-get-performance.c            |    2 +
 libbrasero-media/scsi-inquiry.c                    |    2 +
 libbrasero-media/scsi-mech-status.c                |    2 +
 libbrasero-media/scsi-mmc2.h                       |    1 +
 libbrasero-media/scsi-mmc3.h                       |    2 +
 libbrasero-media/scsi-mode-select.c                |    2 +
 libbrasero-media/scsi-mode-sense.c                 |    2 +
 .../scsi-prevent-allow-medium-removal.c            |    2 +
 libbrasero-media/scsi-read-capacity.c              |    2 +
 libbrasero-media/scsi-read-cd.c                    |    2 +
 libbrasero-media/scsi-read-disc-info.c             |   10 ++
 libbrasero-media/scsi-read-disc-structure.c        |   10 ++
 libbrasero-media/scsi-read-format-capacities.c     |    2 +
 libbrasero-media/scsi-read-toc-pma-atip.c          |    3 +
 libbrasero-media/scsi-read-track-information.c     |    2 +
 libbrasero-media/scsi-read10.c                     |    2 +
 libbrasero-media/scsi-sbc.h                        |    1 +
 libbrasero-media/scsi-spc1.h                       |    1 +
 libbrasero-media/scsi-test-unit-ready.c            |    2 +
 22 files changed, 54 insertions(+), 110 deletions(-)
---
diff --git a/libbrasero-media/Makefile.am b/libbrasero-media/Makefile.am
index b3e108b..9a978e6 100644
--- a/libbrasero-media/Makefile.am
+++ b/libbrasero-media/Makefile.am
@@ -94,7 +94,6 @@ libbrasero_media_la_SOURCES =		\
 	scsi-read-cd.h	\
 	scsi-read-cd.c	\
 	scsi-device.h         \
-	scsi-eject.c         \
 	scsi-mech-status.c         \
 	scsi-mech-status.h         \
 	scsi-write-page.h         \
diff --git a/libbrasero-media/scsi-get-configuration.c b/libbrasero-media/scsi-get-configuration.c
index f562d41..17ddfc5 100644
--- a/libbrasero-media/scsi-get-configuration.c
+++ b/libbrasero-media/scsi-get-configuration.c
@@ -36,6 +36,8 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-mmc2.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-get-performance.c b/libbrasero-media/scsi-get-performance.c
index cf20a3f..398853d 100644
--- a/libbrasero-media/scsi-get-performance.c
+++ b/libbrasero-media/scsi-get-performance.c
@@ -36,6 +36,8 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-mmc3.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-command.h"
diff --git a/libbrasero-media/scsi-inquiry.c b/libbrasero-media/scsi-inquiry.c
index bd63f0e..de48740 100644
--- a/libbrasero-media/scsi-inquiry.c
+++ b/libbrasero-media/scsi-inquiry.c
@@ -32,6 +32,8 @@
 #  include <config.h>
 #endif
 
+#include "scsi-spc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-mech-status.c b/libbrasero-media/scsi-mech-status.c
index 6c24c62..70b9e92 100644
--- a/libbrasero-media/scsi-mech-status.c
+++ b/libbrasero-media/scsi-mech-status.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-mmc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-mmc2.h b/libbrasero-media/scsi-mmc2.h
index 4a763f5..09f0985 100644
--- a/libbrasero-media/scsi-mmc2.h
+++ b/libbrasero-media/scsi-mmc2.h
@@ -32,6 +32,7 @@
 
 #include "scsi-base.h"
 #include "scsi-error.h"
+#include "scsi-device.h"
 #include "scsi-read-capacity.h"
 #include "scsi-get-configuration.h"
 #include "scsi-read-disc-structure.h"
diff --git a/libbrasero-media/scsi-mmc3.h b/libbrasero-media/scsi-mmc3.h
index 5952e45..d8f43cf 100644
--- a/libbrasero-media/scsi-mmc3.h
+++ b/libbrasero-media/scsi-mmc3.h
@@ -32,6 +32,8 @@
 
 #include "scsi-base.h"
 #include "scsi-error.h"
+#include "scsi-device.h"
+
 #include "scsi-get-performance.h"
 #include "scsi-read-toc-pma-atip.h"
 
diff --git a/libbrasero-media/scsi-mode-select.c b/libbrasero-media/scsi-mode-select.c
index f3c6661..6215597 100644
--- a/libbrasero-media/scsi-mode-select.c
+++ b/libbrasero-media/scsi-mode-select.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-spc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-mode-sense.c b/libbrasero-media/scsi-mode-sense.c
index 2c9916a..f03edf3 100644
--- a/libbrasero-media/scsi-mode-sense.c
+++ b/libbrasero-media/scsi-mode-sense.c
@@ -36,6 +36,8 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-spc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-prevent-allow-medium-removal.c b/libbrasero-media/scsi-prevent-allow-medium-removal.c
index 8c9e5e9..90c0021 100644
--- a/libbrasero-media/scsi-prevent-allow-medium-removal.c
+++ b/libbrasero-media/scsi-prevent-allow-medium-removal.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-sbc.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-read-capacity.c b/libbrasero-media/scsi-read-capacity.c
index 237f452..461a1fa 100644
--- a/libbrasero-media/scsi-read-capacity.c
+++ b/libbrasero-media/scsi-read-capacity.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-mmc2.h"
+
 #include "scsi-error.h"
 #include "scsi-base.h"
 #include "scsi-command.h"
diff --git a/libbrasero-media/scsi-read-cd.c b/libbrasero-media/scsi-read-cd.c
index 60550d4..0037536 100644
--- a/libbrasero-media/scsi-read-cd.c
+++ b/libbrasero-media/scsi-read-cd.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-mmc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-read-disc-info.c b/libbrasero-media/scsi-read-disc-info.c
index 128509a..56f042d 100644
--- a/libbrasero-media/scsi-read-disc-info.c
+++ b/libbrasero-media/scsi-read-disc-info.c
@@ -36,6 +36,8 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-mmc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
@@ -146,6 +148,12 @@ end:
 	return res;
 }
 
+#if 0
+
+/* These functions are not used for now but may
+ * be one day. So keep them around but turn 
+ * them off to avoid build warnings */
+ 
 BraseroScsiResult
 brasero_mmc5_read_disc_information_tracks (BraseroDeviceHandle *handle,
 					   BraseroScsiTrackResInfo *info_return,
@@ -183,3 +191,5 @@ brasero_mmc5_read_disc_information_pows (BraseroDeviceHandle *handle,
 	brasero_scsi_command_free (cdb);
 	return res;
 }
+
+#endif
diff --git a/libbrasero-media/scsi-read-disc-structure.c b/libbrasero-media/scsi-read-disc-structure.c
index 67cb342..ce43f38 100644
--- a/libbrasero-media/scsi-read-disc-structure.c
+++ b/libbrasero-media/scsi-read-disc-structure.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-mmc2.h"
+
 #include "brasero-media-private.h"
 
 #include "scsi-error.h"
@@ -164,6 +166,12 @@ brasero_mmc2_read_generic_structure (BraseroDeviceHandle *handle,
 	return res;
 }
 
+#if 0
+
+/* So far this function only creates a warning at
+ * build time and is not used but may be in the
+ * future. */
+
 BraseroScsiResult
 brasero_mmc2_read_dvd_structure (BraseroDeviceHandle *handle,
 				 int address,
@@ -203,3 +211,5 @@ brasero_mmc5_read_bd_structure (BraseroDeviceHandle *handle,
 	brasero_scsi_command_free (cdb);
 	return res;
 }
+
+#endif
diff --git a/libbrasero-media/scsi-read-format-capacities.c b/libbrasero-media/scsi-read-format-capacities.c
index d16001e..6317649 100644
--- a/libbrasero-media/scsi-read-format-capacities.c
+++ b/libbrasero-media/scsi-read-format-capacities.c
@@ -36,6 +36,8 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-mmc2.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-read-toc-pma-atip.c b/libbrasero-media/scsi-read-toc-pma-atip.c
index db5264d..76adad6 100644
--- a/libbrasero-media/scsi-read-toc-pma-atip.c
+++ b/libbrasero-media/scsi-read-toc-pma-atip.c
@@ -36,6 +36,9 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-mmc1.h"
+#include "scsi-mmc3.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-read-track-information.c b/libbrasero-media/scsi-read-track-information.c
index e352035..9415565 100644
--- a/libbrasero-media/scsi-read-track-information.c
+++ b/libbrasero-media/scsi-read-track-information.c
@@ -36,6 +36,8 @@
 
 #include "brasero-media-private.h"
 
+#include "scsi-mmc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-read10.c b/libbrasero-media/scsi-read10.c
index 1a16087..df94d61 100644
--- a/libbrasero-media/scsi-read10.c
+++ b/libbrasero-media/scsi-read10.c
@@ -34,6 +34,8 @@
 
 #include <glib.h>
 
+#include "scsi-sbc.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"
diff --git a/libbrasero-media/scsi-sbc.h b/libbrasero-media/scsi-sbc.h
index 2394b40..7b2dead 100644
--- a/libbrasero-media/scsi-sbc.h
+++ b/libbrasero-media/scsi-sbc.h
@@ -32,6 +32,7 @@
 
 #include "scsi-base.h"
 #include "scsi-error.h"
+#include "scsi-device.h"
 
 #ifndef _BURN_SBC_H
 #define _BURN_SBC_H
diff --git a/libbrasero-media/scsi-spc1.h b/libbrasero-media/scsi-spc1.h
index 710e0df..6392649 100644
--- a/libbrasero-media/scsi-spc1.h
+++ b/libbrasero-media/scsi-spc1.h
@@ -31,6 +31,7 @@
 #include <glib.h>
 
 #include "scsi-base.h"
+#include "scsi-device.h"
 
 #include "scsi-error.h"
 #include "scsi-mode-pages.h"
diff --git a/libbrasero-media/scsi-test-unit-ready.c b/libbrasero-media/scsi-test-unit-ready.c
index 55828b6..8060025 100644
--- a/libbrasero-media/scsi-test-unit-ready.c
+++ b/libbrasero-media/scsi-test-unit-ready.c
@@ -32,6 +32,8 @@
 #  include <config.h>
 #endif
 
+#include "scsi-spc1.h"
+
 #include "scsi-error.h"
 #include "scsi-utils.h"
 #include "scsi-base.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]