Commited patch in issue #8171 (by darktjm).

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64524 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 12 insertions, 37 deletions

diff --git a/plugins/dfcdrom/cdr.c b/plugins/dfcdrom/cdr.c
index 9399f501..cf0a539c 100644
--- a/plugins/dfcdrom/cdr.c
+++ b/plugins/dfcdrom/cdr.c
@@ -468,7 +468,7 @@ long CDRgetTE(unsigned char track, unsigned char *m, unsigned char *s, unsigned
 
 #ifndef _MACOSX
 
-void ExecCfg(char *arg) {
+static void ExecCfg(char *arg) {
 	char cfg[256];
 	struct stat buf;
 
diff --git a/plugins/dfcdrom/cdr.h b/plugins/dfcdrom/cdr.h
index 88291dca..928683d3 100644
--- a/plugins/dfcdrom/cdr.h
+++ b/plugins/dfcdrom/cdr.h
@@ -26,16 +26,6 @@
 
 #include "config.h"
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#include <locale.h>
-#define _(x)  gettext(x)
-#define N_(x) (x)
-#else
-#define _(x)  (x)
-#define N_(x) (x)
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -151,24 +141,6 @@ typedef struct _MMC_READ_CD {
 #define itob(i)		((i)/10*16 + (i)%10)	/* u_char to BCD */
 #define btoi(b)		((b)/16*10 + (b)%16)	/* BCD to u_char */
 
-struct CdrStat {
-	unsigned long Type;
-	unsigned long Status;
-	unsigned char Time[3];		// current playing time
-};
-
-struct SubQ {
-	char res0[12];
-	unsigned char ControlAndADR;
-	unsigned char TrackNumber;
-	unsigned char IndexNumber;
-	unsigned char TrackRelativeAddress[3];
-	unsigned char Filler;
-	unsigned char AbsoluteAddress[3];
-	unsigned char CRC[2];
-	char res1[72];
-};
-
 typedef union {
 	struct cdrom_msf msf;
 	unsigned char buf[CD_FRAMESIZE_RAW];
@@ -210,6 +182,7 @@ long GetTE(unsigned char track, unsigned char *m, unsigned char *s, unsigned cha
 long ReadSector(crdata *cr);
 long PlayCDDA(unsigned char *sector);
 long StopCDDA();
+#include "psemu_plugin_defs.h"
 long GetStatus(int playing, struct CdrStat *stat);
 unsigned char *ReadSub(const unsigned char *time);
 
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 3d3b89b7..454a4e2d 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -27,7 +27,7 @@
 GtkWidget *MainWindow;
 
 // function to check if the device is a cdrom
-int is_cdrom(const char *device) {
+static int is_cdrom(const char *device) {
 	struct stat st;
 	int fd = -1;
 
@@ -78,7 +78,7 @@ int is_cdrom(const char *device) {
 // Are there any other common entry to add to the list? (especially scsi, I
 // deliberately ignored old non standard cdroms... )
 // If you come up with a better method let me know!!
-void fill_drives_list(GtkWidget *widget) {
+static void fill_drives_list(GtkWidget *widget) {
 	int i;
 	GtkListStore *store;
 	GtkTreeIter iter;
diff --git a/plugins/dfcdrom/cfg.c b/plugins/dfcdrom/cfg.c
index 2bbc8447..6985eda6 100644
--- a/plugins/dfcdrom/cfg.c
+++ b/plugins/dfcdrom/cfg.c
@@ -67,12 +67,14 @@ void LoadConf() {
 	f = fopen("dfcdrom.cfg", "r");
 	if (f == NULL) return;
 
-	fscanf(f, "CdromDev = %s\n", CdromDev);
-	fscanf(f, "ReadMode = %ld\n", &ReadMode);
-	fscanf(f, "UseSubQ = %ld\n", &UseSubQ);
-	fscanf(f, "CacheSize = %ld\n", &CacheSize);
-	fscanf(f, "CdrSpeed = %ld\n", &CdrSpeed);
-	fscanf(f, "SpinDown = %ld\n", &SpinDown);
+	if(fscanf(f, "CdromDev = %s\n", CdromDev) != 1 ||
+	   fscanf(f, "ReadMode = %ld\n", &ReadMode) != 1 ||
+	   fscanf(f, "UseSubQ = %ld\n", &UseSubQ) != 1 ||
+	   fscanf(f, "CacheSize = %ld\n", &CacheSize) != 1 ||
+	   fscanf(f, "CdrSpeed = %ld\n", &CdrSpeed) != 1 ||
+	   fscanf(f, "SpinDown = %ld\n", &SpinDown) != 1) {
+	  perror("syntax error in dfcdrom.cfg");
+	}
 	fclose(f);
 
 	if (ReadMode >= READ_MODES) ReadMode = THREADED;